diff options
Diffstat (limited to 'login')
-rw-r--r-- | login/logwtmp.c | 59 | ||||
-rw-r--r-- | login/utmp.h | 4 |
2 files changed, 37 insertions, 26 deletions
diff --git a/login/logwtmp.c b/login/logwtmp.c index 876388323f..b6af813e73 100644 --- a/login/logwtmp.c +++ b/login/logwtmp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -25,38 +25,17 @@ #include <sys/stat.h> void -logwtmp (const char *line, const char *name, const char *host) +updwtmp (const char *wtmp_file, const struct utmp *ut) { - struct utmp ut; struct stat st; size_t written; int fd; /* Open WTMP file. */ - fd = __open (_PATH_WTMP, O_WRONLY | O_APPEND); + fd = __open (wtmp_file, O_WRONLY | O_APPEND); if (fd < 0) return; - /* Set information in new entry. */ - memset (&ut, 0, sizeof (ut)); -#if _HAVE_UT_PID - 0 - ut.ut_pid = getpid (); -#endif -#if _HAVE_UT_TYPE - 0 - ut.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; -#endif - strncpy (ut.ut_line, line, sizeof ut.ut_line); - strncpy (ut.ut_name, name, sizeof ut.ut_name); -#if _HAVE_UT_HOST - 0 - strncpy (ut.ut_host, host, sizeof ut.ut_host); -#endif - -#if _HAVE_UT_TV - 0 - __gettimeofday (&ut.ut_tv, NULL); -#else - time (&ut.ut_time); -#endif - /* Try to lock the file. */ if (__flock (fd, LOCK_EX | LOCK_NB) < 0 && errno != ENOSYS) { @@ -74,8 +53,8 @@ logwtmp (const char *line, const char *name, const char *host) /* Write the entry. If we can't write all the bytes, reset the file size back to the original size. That way, no partial entries will remain. */ - written = __write (fd, &ut, sizeof (ut)); - if (written > 0 && written != sizeof (ut)) + written = __write (fd, ut, sizeof (struct utmp)); + if (written > 0 && written != sizeof (struct utmp)) ftruncate (fd, st.st_size); done: @@ -85,3 +64,31 @@ done: /* Close WTMP file. */ __close (fd); } + +void +logwtmp (const char *line, const char *name, const char *host) +{ + struct utmp ut; + + /* Set information in new entry. */ + memset (&ut, 0, sizeof (ut)); +#if _HAVE_UT_PID - 0 + ut.ut_pid = getpid (); +#endif +#if _HAVE_UT_TYPE - 0 + ut.ut_type = name[0] ? USER_PROCESS : DEAD_PROCESS; +#endif + strncpy (ut.ut_line, line, sizeof ut.ut_line); + strncpy (ut.ut_name, name, sizeof ut.ut_name); +#if _HAVE_UT_HOST - 0 + strncpy (ut.ut_host, host, sizeof ut.ut_host); +#endif + +#if _HAVE_UT_TV - 0 + __gettimeofday (&ut.ut_tv, NULL); +#else + time (&ut.ut_time); +#endif + + updwtmp(_PATH_WTMP, &ut); +} diff --git a/login/utmp.h b/login/utmp.h index 2e87070537..9be0ec5b06 100644 --- a/login/utmp.h +++ b/login/utmp.h @@ -49,6 +49,10 @@ extern void login __P ((__const struct utmp *__entry)); /* Write the utmp entry to say the user on UT_LINE has logged out. */ extern int logout __P ((__const char *__ut_line)); +/* Append the given entry to a wtmp file. */ +extern void updwtmp __P ((__const char *__wtmp_file, + __const struct utmp *__entry)); + /* Append to wtmp an entry for the current time and the given info. */ extern void logwtmp __P ((__const char *__ut_line, __const char *__ut_name, __const char *__ut_host)); |