BSD 4_3_Net_2 release

[unix-history] / usr / src / lib / libc / gen / getlogin.c

diff --git a/usr/src/lib/libc/gen/getlogin.c b/usr/src/lib/libc/gen/getlogin.c
index 991a688..a13d51c 100644 (file)
--- a/usr/src/lib/libc/gen/getlogin.c
+++ b/usr/src/lib/libc/gen/getlogin.c
@@ -2,24 +2,52 @@
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)getlogin.c 5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)getlogin.c 5.9 (Berkeley) 2/23/91";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-#include <sys/types.h>
-#include <stdio.h>
+#include <sys/param.h>

 #include <pwd.h>
 #include <utmp.h>
 #include <pwd.h>
 #include <utmp.h>

+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>

 
 int    _logname_valid;         /* known to setlogin() */
 
 char *
 getlogin()
 {
 
 int    _logname_valid;         /* known to setlogin() */
 
 char *
 getlogin()
 {

-       static char logname[UT_NAMESIZE+1];
+       static char logname[MAXLOGNAME + 1];

 
        if (_logname_valid == 0) {
                if (_getlogin(logname, sizeof(logname) - 1) < 0)
 
        if (_logname_valid == 0) {
                if (_getlogin(logname, sizeof(logname) - 1) < 0)


@@ -29,8 +57,6 @@ getlogin()
        return (*logname ? logname : (char *)NULL);
 }
 
        return (*logname ? logname : (char *)NULL);
 }
 

-uid_t  geteuid();
-

 char *
 cuserid(s)
        char *s;
 char *
 cuserid(s)
        char *s;