summaryrefslogtreecommitdiff
path: root/pwd
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-08-25 19:23:32 +0000
committerRoland McGrath <roland@gnu.org>1995-08-25 19:23:32 +0000
commit7752137a6a9d9a042d2c2f00e245b920e41737bc (patch)
treed0d12093452de95c4c7a609bd14d0094439ad956 /pwd
parent3cf595e562f955e399d80ea9d053e41d50469e6b (diff)
downloadglibc-7752137a6a9d9a042d2c2f00e245b920e41737bc.tar.gz
Fri Aug 25 12:12:42 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* 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 <roland@churchy.gnu.ai.mit.edu> * 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.
Diffstat (limited to 'pwd')
-rw-r--r--pwd/getpwnam.c26
-rw-r--r--pwd/getpwuid.c26
-rw-r--r--pwd/pwd.h8
-rw-r--r--pwd/pwdread.c33
4 files changed, 51 insertions, 42 deletions
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);
}
diff --git a/pwd/getpwuid.c b/pwd/getpwuid.c
index 30e40322db..5093488557 100644
--- a/pwd/getpwuid.c
+++ b/pwd/getpwuid.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 uid. */
struct passwd *
-DEFUN(getpwuid, (uid), register uid_t uid)
+DEFUN(getpwuid, (uid), uid_t uid)
{
- static PTR info;
- register FILE *stream;
- register struct passwd *p;
-
- if (info == NULL)
+ int match (struct passwd *p)
{
- info = __pwdalloc();
- if (info == NULL)
- return(NULL);
+ return p->pw_uid == uid;
}
+ static void *info;
- stream = __pwdopen();
- if (stream == NULL)
- return(NULL);
-
- while ((p = __pwdread(stream, info)) != NULL)
- if (p->pw_uid == uid)
- break;
-
- (void) fclose(stream);
- return(p);
+ return __pwdscan (&info, &match);
}
diff --git a/pwd/pwd.h b/pwd/pwd.h
index c72c37df40..dd7d837b1e 100644
--- a/pwd/pwd.h
+++ b/pwd/pwd.h
@@ -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
@@ -58,6 +58,12 @@ extern struct passwd *__pwdread __P ((FILE * __stream, __ptr_t __p));
/* Return a chunk of memory containing pre-initialized data for __pwdread. */
extern __ptr_t __pwdalloc __P ((void));
+
+/* Scan the password file, filling in P, until SELECTOR returns nonzero for
+ an entry. Return the `struct passwd' of P if successful, NULL on
+ failure. */
+extern struct passwd *__pwdscan __P ((__ptr_t *__p,
+ int (*__selector) (struct passwd *)));
#endif
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;
+}