Libc-594.1.4.tar.gz

[apple/libc.git] / gen / utmpx-nbsd.c

diff --git a/gen/utmpx-nbsd.c b/gen/utmpx-nbsd.c
index 57a3426ad17fd26a4a6f94b6b50e72da8596982a..8a4c3b2929ded7ee82544427872fb95c08f47f7f 100644 (file)
--- a/gen/utmpx-nbsd.c
+++ b/gen/utmpx-nbsd.c
@@ -54,7 +54,9 @@ __RCSID("$NetBSD: utmpx.c,v 1.21 2003/09/06 16:42:10 wiz Exp $");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

+#ifdef LEGACY_UTMP_APIS

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

+#endif /* LEGACY_UTMP_APIS */

 #include <utmpx.h>
 #include <utmpx-darwin.h>
 #include <errno.h>
 #include <utmpx.h>
 #include <utmpx-darwin.h>
 #include <errno.h>


@@ -66,13 +68,14 @@ static int readonly = 0;
 static struct utmpx ut;
 static char utfile[MAXPATHLEN] = _PATH_UTMPX;
 __private_extern__ int utfile_system = 1; /* are we using _PATH_UTMPX? */
 static struct utmpx ut;
 static char utfile[MAXPATHLEN] = _PATH_UTMPX;
 __private_extern__ int utfile_system = 1; /* are we using _PATH_UTMPX? */

+__private_extern__ pthread_mutex_t utmpx_mutex = PTHREAD_MUTEX_INITIALIZER;

 
 static struct utmpx *_getutxid(const struct utmpx *);
 
 __private_extern__ const char _utmpx_vers[] = "utmpx-1.00";
 
 
 static struct utmpx *_getutxid(const struct utmpx *);
 
 __private_extern__ const char _utmpx_vers[] = "utmpx-1.00";
 

-void
-setutxent()
+__private_extern__ void
+_setutxent()

 {
 
        (void)memset(&ut, 0, sizeof(ut));
 {
 
        (void)memset(&ut, 0, sizeof(ut));


@@ -87,7 +90,16 @@ setutxent()
 
 
 void
 
 
 void

-endutxent()
+setutxent()
+{
+       UTMPX_LOCK;
+       _setutxent();
+       UTMPX_UNLOCK;
+}
+
+
+__private_extern__ void
+_endutxent()

 {
 
        (void)memset(&ut, 0, sizeof(ut));
 {
 
        (void)memset(&ut, 0, sizeof(ut));


@@ -99,8 +111,17 @@ endutxent()
 }
 
 
 }
 
 

-struct utmpx *
-getutxent()
+void
+endutxent()
+{
+       UTMPX_LOCK;
+       _endutxent();
+       UTMPX_UNLOCK;
+}
+
+
+static struct utmpx *
+_getutxent()

 {
 #ifdef __LP64__
        struct utmpx32 ut32;
 {
 #ifdef __LP64__
        struct utmpx32 ut32;


@@ -116,7 +137,8 @@ getutxent()
                                else
                                        readonly = 1;
                        }
                                else
                                        readonly = 1;
                        }

-                                       
+
+               fcntl(fileno(fp), F_SETFD, 1); /* set close-on-exec flag */

 
                /* get file size in order to check if new file */
                if (fstat(fileno(fp), &st) == -1)
 
                /* get file size in order to check if new file */
                if (fstat(fileno(fp), &st) == -1)


@@ -174,23 +196,40 @@ fail:
        return NULL;
 }
 
        return NULL;
 }
 

+
+struct utmpx *
+getutxent()
+{
+       struct utmpx *ret;
+       UTMPX_LOCK;
+       ret = _getutxent();
+       UTMPX_UNLOCK;
+       return ret;
+}
+

 struct utmpx *
 getutxid(const struct utmpx *utx)
 {
        struct utmpx temp;
        const struct utmpx *ux;
 struct utmpx *
 getutxid(const struct utmpx *utx)
 {
        struct utmpx temp;
        const struct utmpx *ux;

+       struct utmpx *ret;

 
        _DIAGASSERT(utx != NULL);
 
        if (utx->ut_type == EMPTY)
                return NULL;
 
 
        _DIAGASSERT(utx != NULL);
 
        if (utx->ut_type == EMPTY)
                return NULL;
 

+       UTMPX_LOCK;

        /* make a copy as needed, and auto-fill if requested */
        ux = _utmpx_working_copy(utx, &temp, 1);
        /* make a copy as needed, and auto-fill if requested */
        ux = _utmpx_working_copy(utx, &temp, 1);

-       if (!ux)
+       if (!ux) {
+               UTMPX_UNLOCK;

                return NULL;
                return NULL;

+       }

 
 

-       return _getutxid(ux);
+       ret = _getutxid(ux);
+       UTMPX_UNLOCK;
+       return ret;

 }
 
 
 }
 
 


@@ -231,7 +270,7 @@ _getutxid(const struct utmpx *utx)
                default:
                        return NULL;
                }
                default:
                        return NULL;
                }

-       } while (getutxent() != NULL);
+       } while (_getutxent() != NULL);

        return NULL;
 }
 
        return NULL;
 }
 


@@ -242,6 +281,7 @@ getutxline(const struct utmpx *utx)
 
        _DIAGASSERT(utx != NULL);
 
 
        _DIAGASSERT(utx != NULL);
 

+       UTMPX_LOCK;

        do {
                switch (ut.ut_type) {
                case EMPTY:
        do {
                switch (ut.ut_type) {
                case EMPTY:


@@ -249,13 +289,16 @@ getutxline(const struct utmpx *utx)
                case LOGIN_PROCESS:
                case USER_PROCESS:
                        if (strncmp(ut.ut_line, utx->ut_line,
                case LOGIN_PROCESS:
                case USER_PROCESS:
                        if (strncmp(ut.ut_line, utx->ut_line,

-                           sizeof(ut.ut_line)) == 0)
+                           sizeof(ut.ut_line)) == 0) {
+                               UTMPX_UNLOCK;

                                return &ut;
                                return &ut;

+                       }

                        break;
                default:
                        break;
                }
                        break;
                default:
                        break;
                }

-       } while (getutxent() != NULL);
+       } while (_getutxent() != NULL);
+       UTMPX_UNLOCK;

        return NULL;
 }
 
        return NULL;
 }
 


@@ -272,12 +315,14 @@ pututxline(const struct utmpx *utx)
                return NULL;
        }
 
                return NULL;
        }
 

+       UTMPX_LOCK;

        if ((ux = _pututxline(utx)) != NULL && utfile_system) {
                _utmpx_asl(ux); /* the equivalent of wtmpx and lastlogx */
 #ifdef UTMP_COMPAT
                _write_utmp_compat(ux);
 #endif /* UTMP_COMPAT */
        }
        if ((ux = _pututxline(utx)) != NULL && utfile_system) {
                _utmpx_asl(ux); /* the equivalent of wtmpx and lastlogx */
 #ifdef UTMP_COMPAT
                _write_utmp_compat(ux);
 #endif /* UTMP_COMPAT */
        }

+       UTMPX_UNLOCK;

        return ux;
 }
 
        return ux;
 }
 


@@ -289,8 +334,10 @@ _pututxline(const struct utmpx *utx)
 #ifdef __LP64__
        struct utmpx32 ut32;
 #endif /* __LP64__ */
 #ifdef __LP64__
        struct utmpx32 ut32;
 #endif /* __LP64__ */

-       int gotlock = 0;
+       struct flock fl;
+#define gotlock                (fl.l_start >= 0)

 
 

+       fl.l_start = -1; /* also means we haven't locked */

        if (utfile_system)
                if ((fp != NULL && readonly) || (fp == NULL && geteuid() != 0)) {
                        errno = EPERM;
        if (utfile_system)
                if ((fp != NULL && readonly) || (fp == NULL && geteuid() != 0)) {
                        errno = EPERM;


@@ -298,7 +345,7 @@ _pututxline(const struct utmpx *utx)
                }
 
        if (fp == NULL) {
                }
 
        if (fp == NULL) {

-               (void)getutxent();
+               (void)_getutxent();

                if (fp == NULL || readonly) {
                        errno = EPERM;
                        return NULL;
                if (fp == NULL || readonly) {
                        errno = EPERM;
                        return NULL;


@@ -311,7 +358,7 @@ _pututxline(const struct utmpx *utx)
                return NULL;
 
        if ((x = _getutxid(ux)) == NULL) {
                return NULL;
 
        if ((x = _getutxid(ux)) == NULL) {

-               setutxent();
+               _setutxent();

                if ((x = _getutxid(ux)) == NULL) {
                        /*
                         * utx->ut_type has any original mask bits, while
                if ((x = _getutxid(ux)) == NULL) {
                        /*
                         * utx->ut_type has any original mask bits, while


@@ -325,9 +372,17 @@ _pututxline(const struct utmpx *utx)
                                errno = EINVAL;
                                return NULL;
                        }
                                errno = EINVAL;
                                return NULL;
                        }

-                       if (lockf(fileno(fp), F_LOCK, (off_t)0) == -1)
+                       /*
+                        * Replace lockf() with fcntl() and a fixed start
+                        * value.  We should already be at EOF.
+                        */
+                       if ((fl.l_start = lseek(fileno(fp), 0, SEEK_CUR)) < 0)
+                               return NULL;
+                       fl.l_len = 0;
+                       fl.l_whence = SEEK_SET;
+                       fl.l_type = F_WRLCK;
+                       if (fcntl(fileno(fp), F_SETLKW, &fl) == -1)

                                return NULL;
                                return NULL;

-                       gotlock++;

                        if (fseeko(fp, (off_t)0, SEEK_END) == -1)
                                goto fail;
                }
                        if (fseeko(fp, (off_t)0, SEEK_END) == -1)
                                goto fail;
                }


@@ -372,7 +427,8 @@ _pututxline(const struct utmpx *utx)
 fail:
        if (gotlock) {
                int save = errno;
 fail:
        if (gotlock) {
                int save = errno;

-               if (lockf(fileno(fp), F_ULOCK, (off_t)0) == -1)
+               fl.l_type = F_UNLCK;
+               if (fcntl(fileno(fp), F_SETLK, &fl) == -1)

                        return NULL;
                errno = save;
        }
                        return NULL;
                errno = save;
        }


@@ -388,29 +444,36 @@ utmpxname(const char *fname)
 {
        size_t len;
 
 {
        size_t len;
 

+       UTMPX_LOCK;

        if (fname == NULL) {
                strcpy(utfile, _PATH_UTMPX);
                utfile_system = 1;
        if (fname == NULL) {
                strcpy(utfile, _PATH_UTMPX);
                utfile_system = 1;

-               endutxent();
+               _endutxent();
+               UTMPX_UNLOCK;

                return 1;
        }
 
        len = strlen(fname);
 
                return 1;
        }
 
        len = strlen(fname);
 

-       if (len >= sizeof(utfile))
+       if (len >= sizeof(utfile)) {
+               UTMPX_UNLOCK;

                return 0;
                return 0;

+       }

 
        /* must end in x! */
 
        /* must end in x! */

-       if (fname[len - 1] != 'x')
+       if (fname[len - 1] != 'x') {
+               UTMPX_UNLOCK;

                return 0;
                return 0;

+       }

 
        (void)strlcpy(utfile, fname, sizeof(utfile));
 
        (void)strlcpy(utfile, fname, sizeof(utfile));

-       endutxent();
+       _endutxent();

        utfile_system = 0;
        utfile_system = 0;

+       UTMPX_UNLOCK;

        return 1;
 }
 
        return 1;
 }
 

-
+#ifdef LEGACY_UTMP_APIS

 void
 getutmp(const struct utmpx *ux, struct utmp *u)
 {
 void
 getutmp(const struct utmpx *ux, struct utmp *u)
 {


@@ -438,3 +501,4 @@ getutmpx(const struct utmp *u, struct utmpx *ux)
        ux->ut_pid = getpid();
        ux->ut_type = USER_PROCESS;
 }
        ux->ut_pid = getpid();
        ux->ut_type = USER_PROCESS;
 }

+#endif /* LEGACY_UTMP_APIS */