From 7752137a6a9d9a042d2c2f00e245b920e41737bc Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 25 Aug 1995 19:23:32 +0000 Subject: Fri Aug 25 12:12:42 1995 Roland McGrath * sysdeps/mach/hurd/mmap.c: Fix inverted test of MAP_FIXED. * stdio/vfscanf.c (number): Allow field width to inhibit first digit after base detection. * stdio/vfprintf.c (vfprintf: %s): Never search past the limit specified by the precision. * grp/grpread.c (__grpscan): New function. * grp/grp.h (__grpscan): Declare it. * grp/getgrgid.c: Use __grpscan. * grp/getgrnam.c: Likewise. * pwd/pwdread.c (__pwdscan): New function. * pwd/pwd.h (__pwdscan): Declare it. * pwd/getpwnam.c: Use __pwdscan. * pwd/getpwuid.c: Likewise. Thu Aug 24 16:29:40 1995 Roland McGrath * sysdeps/mach/hurd/mmap.c: Treat (FLAGS & MAP_TYPE) == 0 like MAP_FILE. * hurd/thread-cancel.c: Return EINTR when called on self. * sysdeps/i386/elf/start.S (data_start): Define as weak alias for __data_start. --- pwd/pwdread.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) (limited to 'pwd/pwdread.c') diff --git a/pwd/pwdread.c b/pwd/pwdread.c index 0ce27d77b9..12032367fa 100644 --- a/pwd/pwdread.c +++ b/pwd/pwdread.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -114,3 +114,34 @@ DEFUN(__pwdread, (stream, p), FILE *stream AND PTR CONST p) return &info->p; } + + +struct passwd * +__pwdscan (void **info, int (*selector) (struct passwd *)) +{ + FILE *stream; + struct passwd *p; + + if (*info == NULL) + { + *info = __pwdalloc (); + if (info == NULL) + return NULL; + } + + stream = __pwdopen (); + if (stream == NULL) + return NULL; + + p = NULL; + while (! feof (stream)) + { + p = __pwdread (stream, *info); + if (p && (*selector) (p)) + break; + p = NULL; + } + + (void) fclose (stream); + return p; +} -- cgit v1.2.3