diff options
Diffstat (limited to 'pwd')
| -rw-r--r-- | pwd/Makefile | 6 | ||||
| -rw-r--r-- | pwd/fgetpwent.c | 53 | ||||
| -rw-r--r-- | pwd/getpwent.c | 59 | ||||
| -rw-r--r-- | pwd/getpwent_r.c | 30 | ||||
| -rw-r--r-- | pwd/getpwnam.c | 30 | ||||
| -rw-r--r-- | pwd/getpwnam_r.c | 30 | ||||
| -rw-r--r-- | pwd/getpwuid.c | 30 | ||||
| -rw-r--r-- | pwd/getpwuid_r.c (renamed from pwd/pwdopen.c) | 24 | ||||
| -rw-r--r-- | pwd/pwdread.c | 147 |
9 files changed, 151 insertions, 258 deletions
diff --git a/pwd/Makefile b/pwd/Makefile index b33700a95f..ce67d49ea9 100644 --- a/pwd/Makefile +++ b/pwd/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991 Free Software Foundation, Inc. +# Copyright (C) 1991, 1996 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 @@ -21,6 +21,8 @@ # subdir := pwd -routines := pwdopen pwdread fgetpwent getpw getpwent getpwnam getpwuid putpwent +routines := fgetpwent getpw putpwent \ + getpwent getpwnam getpwuid \ + getpwent_r getpwnam_r getpwuid_r include ../Rules diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index 4a21cbb59a..ba9f834905 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -16,25 +16,50 @@ 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 <ansidecl.h> -#include <errno.h> -#include <limits.h> -#include <stddef.h> #include <stdio.h> -#include <string.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); + STRING_FIELD (result->pw_passwd, ISCOLON); + INT_FIELD (result->pw_uid, ISCOLON, 10,); + INT_FIELD (result->pw_gid, ISCOLON, 10,); + STRING_FIELD (result->pw_gecos, ISCOLON); + STRING_FIELD (result->pw_dir, ISCOLON); + result->pw_shell = line; +) + + /* Read one entry from the given stream. */ struct passwd * -DEFUN(fgetpwent, (stream), FILE *stream) +fgetpwent (FILE *stream) { - static PTR info = NULL; - if (info == NULL) + static char buffer[BUFSIZ]; + static struct passwd result; + char *p; + + do { - info = __pwdalloc(); - if (info == NULL) - return(NULL); - } + 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(__pwdread(stream, info)); + return &result; } diff --git a/pwd/getpwent.c b/pwd/getpwent.c index 1c88950f11..79edbd5db0 100644 --- a/pwd/getpwent.c +++ b/pwd/getpwent.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,55 +14,17 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public 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. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> -#include <stddef.h> -#include <stdio.h> #include <pwd.h> -static FILE *stream = NULL; -/* Rewind the stream. */ -void -DEFUN_VOID(setpwent) -{ - if (stream != NULL) - rewind(stream); -} +#define LOOKUP_TYPE struct passwd +#define SETFUNC_NAME setpwent +#define GETFUNC_NAME getpwent +#define ENDFUNC_NAME endpwent +#define DATABASE_NAME passwd +#define BUFLEN 1024 - -/* Close the stream. */ -void -DEFUN_VOID(endpwent) -{ - if (stream != NULL) - { - (void) fclose(stream); - stream = NULL; - } -} - - -/* Return one entry from the password file. */ -struct passwd * -DEFUN_VOID(getpwent) -{ - static PTR info = NULL; - if (info == NULL) - { - info = __pwdalloc(); - if (info == NULL) - return(NULL); - } - - if (stream == NULL) - { - stream = __pwdopen(); - if (stream == NULL) - return(NULL); - } - - return(__pwdread(stream, info)); -} +#include "../nss/getXXent.c" diff --git a/pwd/getpwent_r.c b/pwd/getpwent_r.c new file mode 100644 index 0000000000..ced7f8a639 --- /dev/null +++ b/pwd/getpwent_r.c @@ -0,0 +1,30 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <pwd.h> + + +#define LOOKUP_TYPE struct passwd +#define SETFUNC_NAME setpwent +#define GETFUNC_NAME getpwent +#define ENDFUNC_NAME endpwent +#define DATABASE_NAME passwd +#define BUFLEN 1024 + +#include "../nss/getXXent_r.c" diff --git a/pwd/getpwnam.c b/pwd/getpwnam.c index bac8b6b4da..597b8d1205 100644 --- a/pwd/getpwnam.c +++ b/pwd/getpwnam.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,24 +14,17 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public 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. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> -#include <stddef.h> -#include <stdio.h> -#include <string.h> #include <pwd.h> -/* Search for an entry with a matching name. */ -struct passwd * -DEFUN(getpwnam, (name), const char *name) -{ - int match (struct passwd *p) - { - return ! strcmp (name, p->pw_name); - } - static void *info; - return __pwdscan (&info, &match); -} +#define LOOKUP_TYPE struct passwd +#define FUNCTION_NAME getpwnam +#define DATABASE_NAME passwd +#define ADD_PARAMS const char *name +#define ADD_VARIABLES name +#define BUFLEN 1024 + +#include "../nss/getXXbyYY.c" diff --git a/pwd/getpwnam_r.c b/pwd/getpwnam_r.c new file mode 100644 index 0000000000..c2d1f84d81 --- /dev/null +++ b/pwd/getpwnam_r.c @@ -0,0 +1,30 @@ +/* Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + +The GNU C Library is free software; you can redistribute it and/or +modify it under the terms of the GNU Library General Public License as +published by the Free Software Foundation; either version 2 of the +License, or (at your option) any later version. + +The GNU C Library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Library General Public License for more details. + +You should have received a copy of the GNU Library General Public +License along with the GNU C Library; see the file COPYING.LIB. If +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <pwd.h> + + +#define LOOKUP_TYPE struct passwd +#define FUNCTION_NAME getpwnam +#define DATABASE_NAME passwd +#define ADD_PARAMS const char *name +#define ADD_VARIABLES name +#define BUFLEN 1024 + +#include "../nss/getXXbyYY_r.c" diff --git a/pwd/getpwuid.c b/pwd/getpwuid.c index 5093488557..130c251f89 100644 --- a/pwd/getpwuid.c +++ b/pwd/getpwuid.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,24 +14,17 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public 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. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> -#include <stddef.h> -#include <stdio.h> #include <pwd.h> -#include <sys/types.h> -/* Search for an entry with a matching uid. */ -struct passwd * -DEFUN(getpwuid, (uid), uid_t uid) -{ - int match (struct passwd *p) - { - return p->pw_uid == uid; - } - static void *info; - return __pwdscan (&info, &match); -} +#define LOOKUP_TYPE struct passwd +#define FUNCTION_NAME getpwuid +#define DATABASE_NAME passwd +#define ADD_PARAMS uid_t uid +#define ADD_VARIABLES uid +#define BUFLEN 1024 + +#include "../nss/getXXbyYY.c" diff --git a/pwd/pwdopen.c b/pwd/getpwuid_r.c index 6d35ab9441..e3bf7578ae 100644 --- a/pwd/pwdopen.c +++ b/pwd/getpwuid_r.c @@ -1,5 +1,6 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as @@ -13,16 +14,17 @@ Library General Public License for more details. You should have received a copy of the GNU Library General Public 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. */ +not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> -#include <stdio.h> #include <pwd.h> -/* Return a new stream open on the password file. */ -FILE * -DEFUN_VOID(__pwdopen) -{ - return(fopen("/etc/passwd", "r")); -} + +#define LOOKUP_TYPE struct passwd +#define FUNCTION_NAME getpwuid +#define DATABASE_NAME passwd +#define ADD_PARAMS uid_t uid +#define ADD_VARIABLES uid +#define BUFLEN 1024 + +#include "../nss/getXXbyYY_r.c" diff --git a/pwd/pwdread.c b/pwd/pwdread.c deleted file mode 100644 index 12032367fa..0000000000 --- a/pwd/pwdread.c +++ /dev/null @@ -1,147 +0,0 @@ -/* 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -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 <ansidecl.h> -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <pwd.h> -#include <sys/types.h> - - -/* This is the function that all the others are based on. - The format of the password file is known only here. */ - -/* Structure containing info kept by each __pwdread caller. */ -typedef struct - { - char *buf; - size_t buflen; - struct passwd p; - } pwdread_info; - - -/* Return a chunk of memory containing a pre-initialized `pwdread_info'. */ -PTR -DEFUN_VOID(__pwdalloc) -{ - pwdread_info *info = (PTR) malloc (sizeof(pwdread_info)); - if (info == NULL) - return NULL; - info->buf = NULL; - info->buflen = 0; - return info; -} - -/* Read a password entry from STREAM, filling in P. */ -struct passwd * -DEFUN(__pwdread, (stream, p), FILE *stream AND PTR CONST p) -{ - register pwdread_info *CONST info = (pwdread_info *) p; - char *start, *end; - - /* Idiocy checks. */ - if (stream == NULL) - { - errno = EINVAL; - return NULL; - } - - do - if (__getline (&info->buf, &info->buflen, stream) == -1) - return NULL; - while (info->buf[0] == '#'); - - start = info->buf; - end = strchr (start, ':'); - if (end == NULL) - return NULL; - *end = '\0'; - info->p.pw_name = start; - - start = end + 1; - end = strchr (start, ':'); - if (end == NULL) - return NULL; - *end = '\0'; - info->p.pw_passwd = start; - - info->p.pw_uid = (uid_t) strtol (end + 1, &end, 10); - if (*end != ':') - return NULL; - info->p.pw_gid = (gid_t) strtol (end + 1, &end, 10); - if (*end != ':') - return NULL; - - start = end + 1; - end = strchr (start, ':'); - if (end == NULL) - return NULL; - *end = '\0'; - info->p.pw_gecos = start; - - start = end + 1; - end = strchr (start, ':'); - if (end == NULL) - return NULL; - *end = '\0'; - info->p.pw_dir = start; - - start = end + 1; - end = strchr (start, '\n'); - if (end == NULL) - return NULL; - *end = '\0'; - info->p.pw_shell = start; - - 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; -} |