X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=0f844e84497025cf49bd6e2b70e7c74d0d547559;hb=c3edfc411c57b3bd4f12a09674f143651990c1f2;hp=d29163c0c1b5b44202127793479b9038afed2202;hpb=7abd4b240bc7c882a73035f494321855f8876d39;p=gnulib.git diff --git a/lib/readutmp.c b/lib/readutmp.c index d29163c0c..0f844e844 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -1,5 +1,5 @@ /* GNU's read utmp module. - Copyright (C) 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1992-2001, 2003, 2004 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,16 +19,21 @@ #include +#include "readutmp.h" + +#include +#include + +#include #include -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -# include -#else -# include -#endif /* STDC_HEADERS || HAVE_STRING_H */ +#include +#include -#include "readutmp.h" +#include "xalloc.h" -char *xmalloc (); +#if USE_UNLOCKED_IO +# include "unlocked-io.h" +#endif /* Copy UT->ut_name into storage obtained from malloc. Then remove any trailing spaces from the copy, NUL terminate it, and return the copy. */ @@ -38,81 +43,58 @@ extract_trimmed_name (const STRUCT_UTMP *ut) { char *p, *trimmed_name; - trimmed_name = xmalloc (sizeof (ut->ut_name) + 1); - strncpy (trimmed_name, ut->ut_name, sizeof (ut->ut_name)); - /* Append a trailing space character. Some systems pad names shorter than - the maximum with spaces, others pad with NULs. Remove any spaces. */ - trimmed_name[sizeof (ut->ut_name)] = ' '; - p = strchr (trimmed_name, ' '); - if (p != NULL) - *p = '\0'; + trimmed_name = xmalloc (sizeof (UT_USER (ut)) + 1); + strncpy (trimmed_name, UT_USER (ut), sizeof (UT_USER (ut))); + /* Append a trailing NUL. Some systems pad names shorter than the + maximum with spaces, others pad with NULs. Remove any trailing + spaces. */ + trimmed_name[sizeof (UT_USER (ut))] = '\0'; + for (p = trimmed_name + strlen (trimmed_name); + trimmed_name < p && p[-1] == ' '; + *--p = '\0') + continue; return trimmed_name; } -/* Read the utmp file FILENAME into *UTMP_BUF, set *N_ENTRIES to the - number of entries read, and return zero. If there is any error, - return non-zero and don't modify the parameters. */ +/* Read the utmp entries corresponding to file FILENAME into freshly- + malloc'd storage, set *UTMP_BUF to that pointer, set *N_ENTRIES to + the number of entries, and return zero. If there is any error, + return -1, setting errno, and don't modify the parameters. */ -#ifdef HAVE_UTMPNAME +#ifdef UTMP_NAME_FUNCTION int -read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf) +read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf) { - int count_utmp = 0; - int n_read; + size_t n_read; + size_t n_alloc = 4; + STRUCT_UTMP *utmp = xmalloc (n_alloc * sizeof *utmp); STRUCT_UTMP *u; - STRUCT_UTMP *uptr; - STRUCT_UTMP *utmp_contents; - - if (utmpname (filename)) - { - return 1; - } - - /* FIXME: going through the list twice is wasteful. */ - - /* count the entries in utmp */ - setutent (); - while ((u = getutent ()) != NULL) - ++count_utmp; - - if (count_utmp == 0) - return 0; - utmp_contents = (STRUCT_UTMP *) xmalloc (count_utmp * sizeof (STRUCT_UTMP)); + /* Ignore the return value for now. + Solaris' utmpname returns 1 upon success -- which is contrary + to what the GNU libc version does. In addition, older GNU libc + versions are actually void. */ + UTMP_NAME_FUNCTION (filename); - /* read the entries in utmp */ - - /* FIXME: can this fail? */ - setutent (); + SET_UTMP_ENT (); n_read = 0; - uptr = utmp_contents; - while ((u = getutent ()) != NULL) + while ((u = GET_UTMP_ENT ()) != NULL) { - ++n_read; - if (n_read > count_utmp) + if (n_read == n_alloc) { - STRUCT_UTMP *old_utmp_contents = utmp_contents; - ++count_utmp; - utmp_contents = (STRUCT_UTMP *) xrealloc (utmp_contents, - (count_utmp - * sizeof (STRUCT_UTMP))); - uptr = utmp_contents + (uptr - old_utmp_contents); + utmp = xnrealloc (utmp, n_alloc, 2 * sizeof *utmp); + n_alloc *= 2; } - *uptr = *u; - ++uptr; + ++n_read; + utmp[n_read - 1] = *u; } - if (n_read != count_utmp) - utmp_contents = (STRUCT_UTMP *) xrealloc (utmp_contents, - n_read * sizeof (STRUCT_UTMP)); - - /* FIXME: can this fail? */ - endutent (); + END_UTMP_ENT (); *n_entries = n_read; - *utmp_buf = utmp_contents; + *utmp_buf = utmp; return 0; } @@ -120,7 +102,7 @@ read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf) #else int -read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf) +read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf) { FILE *utmp; struct stat file_stats; @@ -130,28 +112,38 @@ read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf) utmp = fopen (filename, "r"); if (utmp == NULL) - return 1; + return -1; - fstat (fileno (utmp), &file_stats); + if (fstat (fileno (utmp), &file_stats) != 0) + { + int e = errno; + fclose (utmp); + errno = e; + return -1; + } size = file_stats.st_size; - if (size > 0) - buf = (STRUCT_UTMP *) xmalloc (size); - else + buf = xmalloc (size); + n_read = fread (buf, sizeof *buf, size / sizeof *buf, utmp); + if (ferror (utmp)) { + int e = errno; + free (buf); fclose (utmp); - return 1; + errno = e; + return -1; + } + if (fclose (utmp) != 0) + { + int e = errno; + free (buf); + errno = e; + return -1; } - /* Use < instead of != in case the utmp just grew. */ - n_read = fread (buf, 1, size, utmp); - if (ferror (utmp) || fclose (utmp) == EOF - || n_read < size) - return 1; - - *n_entries = size / sizeof (STRUCT_UTMP); + *n_entries = n_read; *utmp_buf = buf; return 0; } -#endif /* HAVE_UTMPNAME */ +#endif