diff options
| author | Roland McGrath <roland@gnu.org> | 2002-09-20 22:07:20 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-09-20 22:07:20 +0000 |
| commit | 82c261269b2d8402958f7ee393d6c701b335ef7c (patch) | |
| tree | 132948c73c62a04f8cf162b46a02e6ac67de88db /sysdeps/generic/utmp_file.c | |
| parent | 800a312a56abc34e98c5b2474260adc8c4faccd7 (diff) | |
| download | glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.tar glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.tar.gz glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.tar.bz2 glibc-82c261269b2d8402958f7ee393d6c701b335ef7c.zip | |
* sysdeps/generic/utmp-equal.h: New file, extracted from utmp_file.c.
* sysdeps/generic/utmp_file.c (setutent_file): Invalidate last_entry
also on platforms with !HAVE_UT_TYPE.
(proc_utmp_eq): Remove function.
(internal_getut_r, pututline_file): Call __utmp_equal instead.
2002-09-20 Bruno Haible <bruno@clisp.org>
* abi-tags: Add support for FreeBSD with ABI OS value 3.
* elf/cache.c (print_entry): Support the GNU/FreeBSD ABI tag.
Diffstat (limited to 'sysdeps/generic/utmp_file.c')
| -rw-r--r-- | sysdeps/generic/utmp_file.c | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c index 1bd56f4449..169f0c7363 100644 --- a/sysdeps/generic/utmp_file.c +++ b/sysdeps/generic/utmp_file.c @@ -28,6 +28,7 @@ #include <utmp.h> #include "utmp-private.h" +#include "utmp-equal.h" /* Descriptor for the file and position. */ @@ -148,9 +149,14 @@ setutent_file (void) __lseek64 (file_fd, 0, SEEK_SET); file_offset = 0; -#if _HAVE_UT_TYPE - 0 /* Make sure the entry won't match. */ +#if _HAVE_UT_TYPE - 0 last_entry.ut_type = -1; +#else + last_entry.ut_line[0] = '\177'; +# if _HAVE_UT_ID - 0 + last_entry.ut_id[0] = '\0'; +# endif #endif return 1; @@ -200,33 +206,6 @@ getutent_r_file (struct utmp *buffer, struct utmp **result) static int -proc_utmp_eq (const struct utmp *entry, const struct utmp *match) -{ - return - ( -#if _HAVE_UT_TYPE - 0 - (entry->ut_type == INIT_PROCESS - || entry->ut_type == LOGIN_PROCESS - || entry->ut_type == USER_PROCESS - || entry->ut_type == DEAD_PROCESS) - && - (match->ut_type == INIT_PROCESS - || match->ut_type == LOGIN_PROCESS - || match->ut_type == USER_PROCESS - || match->ut_type == DEAD_PROCESS) - && -#endif -#if _HAVE_UT_ID - 0 - (entry->ut_id[0] && match->ut_id[0] - ? strncmp (entry->ut_id, match->ut_id, sizeof match->ut_id) == 0 - : strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0) -#else - strncmp (entry->ut_line, match->ut_line, sizeof match->ut_line) == 0 -#endif - ); -} - -static int internal_getut_r (const struct utmp *id, struct utmp *buffer) { int result = -1; @@ -275,7 +254,7 @@ internal_getut_r (const struct utmp *id, struct utmp *buffer) } file_offset += sizeof (struct utmp); - if (proc_utmp_eq (buffer, id)) + if (__utmp_equal (buffer, id)) break; } } @@ -390,7 +369,7 @@ pututline_file (const struct utmp *data) || last_entry.ut_type == NEW_TIME)) || #endif - proc_utmp_eq (&last_entry, data))) + __utmp_equal (&last_entry, data))) found = 1; else found = internal_getut_r (data, &buffer); |