Libc-763.12.tar.gz

[apple/libc.git] / gen / FreeBSD / getlogin.c

diff --git a/gen/FreeBSD/getlogin.c b/gen/FreeBSD/getlogin.c
index 5a5b42b7c3c64c5304740cfee78c8eb3c1b304f1..823d520c60be1c699ca150b37729cd0f62434658 100644 (file)
--- a/gen/FreeBSD/getlogin.c
+++ b/gen/FreeBSD/getlogin.c
@@ -10,10 +10,6 @@
  * 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.
  * 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.
  * 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.


@@ -35,12 +31,11 @@
 static char sccsid[] = "@(#)getlogin.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 static char sccsid[] = "@(#)getlogin.c 8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>

-__FBSDID("$FreeBSD: src/lib/libc/gen/getlogin.c,v 1.8 2002/03/29 22:43:41 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getlogin.c,v 1.11 2009/12/05 19:04:21 ed Exp $");

 
 #include <sys/param.h>
 #include <errno.h>
 #include <pwd.h>
 
 #include <sys/param.h>
 #include <errno.h>
 #include <pwd.h>

-#include <utmp.h>

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


@@ -64,11 +59,7 @@ getlogin_basic(int *status)
        static char logname[MAXLOGNAME];
 
        if (_logname_valid == 0) {
        static char logname[MAXLOGNAME];
 
        if (_logname_valid == 0) {

-#ifdef __NETBSD_SYSCALLS
-               if (_getlogin(logname, sizeof(logname) - 1) < 0) {
-#else

                if (_getlogin(logname, sizeof(logname)) < 0) {
                if (_getlogin(logname, sizeof(logname)) < 0) {

-#endif

                        *status = errno;
                        return (NULL);
                }
                        *status = errno;
                        return (NULL);
                }