diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-08-10 00:00:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-08-10 00:00:16 +0000 |
| commit | a8922de8c70ba56fda40ce9e171c4069a6a90d53 (patch) | |
| tree | 2a8f8a7b499ab4ab42c7713c3de24c4226cbc2cd /pwd/fgetpwent.c | |
| parent | a5113b141cd85a98b4711607c430e6e01775bd9a (diff) | |
Update for 960809.
Fri Aug 9 17:38:58 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/sys/timex.h: Include <sys/time.h> to
get `struct timeval'.
* sysdeps/unix/sysv/linux/sys/acct.h: Get time_t from <time.h>.
* sysdeps/unix/sysv/linux/sys/module.h: Get size_t from <stddef.h>.
* sysdeps/unix/sysv/linux/sys/io.h: Get definition of __P.
* sysdeps/unix/sysv/linux/sys/klog.h: Likewise.
* gmon/sys/gmon.h: Include <sys/types.h> to get u_long.
* sysdeps/unix/sysv/linux/direntry.h: Complete types in
<linux/dirent.h>.
* io/fts.h: Include <sys/types.h> to get dev_t.
Reported by Matthias Urlichs.
* sysdeps/posix/tempname.c [USE_IN_LIBIO]: Don't clear
_IO_file_flags. It's the same as _flags.
Reported by Miquel van Smoorenburg <miquels@Q.cistron.nl>.
Wed Aug 7 19:38:47 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/m68k/resourcebits.h: Add RLIMIT_AS.
Diffstat (limited to 'pwd/fgetpwent.c')
| -rw-r--r-- | pwd/fgetpwent.c | 38 |
1 files changed, 2 insertions, 36 deletions
diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index f8548fe29b..215d6e07c8 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -16,27 +16,8 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <stdio.h> #include <pwd.h> - -/* Define a line parsing function using the common code - used in the nss_files module. */ - -#define STRUCTURE passwd -#define ENTNAME pwent -struct pwent_data {}; - -#include "../nss/nss_files/files-parse.c" -LINE_PARSER -(, - STRING_FIELD (result->pw_name, ISCOLON, 0); - STRING_FIELD (result->pw_passwd, ISCOLON, 0); - INT_FIELD (result->pw_uid, ISCOLON, 0, 10,); - INT_FIELD (result->pw_gid, ISCOLON, 0, 10,); - STRING_FIELD (result->pw_gecos, ISCOLON, 0); - STRING_FIELD (result->pw_dir, ISCOLON, 0); - result->pw_shell = line; - ) +#include <stdio.h> /* Read one entry from the given stream. */ @@ -45,21 +26,6 @@ fgetpwent (FILE *stream) { static char buffer[BUFSIZ]; static struct passwd result; - char *p; - - do - { - p = fgets (buffer, sizeof buffer, stream); - if (p == NULL) - return NULL; - - /* Skip leading blanks. */ - while (isspace (*p)) - ++p; - } while (*p == '\0' || *p == '#' || /* Ignore empty and comment lines. */ - /* Parse the line. If it is invalid, loop to - get the next line of the file to parse. */ - ! parse_line (p, &result, (void *) buffer, sizeof buffer)); - return &result; + return __fgetpwent_r (stream, &result, buffer, sizeof buffer); } |