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/getpwnam.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'pwd/getpwnam.c') diff --git a/pwd/getpwnam.c b/pwd/getpwnam.c index 1e7ea5c891..bac8b6b4da 100644 --- a/pwd/getpwnam.c +++ b/pwd/getpwnam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 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 @@ -24,27 +24,13 @@ Cambridge, MA 02139, USA. */ /* Search for an entry with a matching name. */ struct passwd * -DEFUN(getpwnam, (name), register CONST char *name) +DEFUN(getpwnam, (name), const char *name) { - static PTR info = NULL; - register FILE *stream; - register struct passwd *p; - - if (info == NULL) + int match (struct passwd *p) { - info = __pwdalloc(); - if (info == NULL) - return(NULL); + return ! strcmp (name, p->pw_name); } + static void *info; - stream = __pwdopen(); - if (stream == NULL) - return(NULL); - - while ((p = __pwdread(stream, info)) != NULL) - if (!strcmp(p->pw_name, name)) - break; - - (void) fclose(stream); - return(p); + return __pwdscan (&info, &match); } -- cgit v1.2.3