From 5f0e6fc702296840d2daa39f83f6cb1e40073d58 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 25 Jun 1996 08:56:57 +0000 Subject: Tue Jun 25 02:59:11 1996 Roland McGrath * malloc/malloc.h: Declare malloc_object_allocated_size, malloc_walk. * malloc/Makefile (dist-routines): Add malloc-size, malloc-walk. * malloc/malloc-size.c: New file. * malloc/malloc-walk.c: New file. * malloc/malloc-find.c (malloc_find_object_address): Return null if PTR is outside the heap. * elf/dl-load.c (_dl_map_object): If the requested name matches the soname of a loaded object, use that object. Mon Jun 24 19:57:01 1996 Roland McGrath * Makefile (subdirs): Add nss. * inet/Makefile (routines): Add getrpcent, getrpcbyname, getrpcbynumber, getrpcent_r, getrpcbyname_r, getrpcbynumber_r. * inet/getrpcbynumber_r.c: New file. * inet/getrpcbynumber.c: New file. * inet/getrpcbyname.c: New file. * inet/getrpcbyname_r.c: New file. * inet/getrpcent_r.c: New file. * inet/getrpcent.c: New file. * nss/rpc-lookup.c: New file. * nss/nss_files/files-rpc.c: New file. * nss/Makefile (routines): Add rpc-lookup. (libnss_files-routines): Add files-rpc. * sunrpc/Makefile (routines): Remove getrpcent. * sunrpc/getrpcent.c: File removed. * nss/getXXent_r.c (REENTRANT_GETNAME): Clear NO_MORE when NIP is non-null on entry. * Makeconfig (rpath-link): Add $(nssobjdir). (nssobjdir): New variable. * Makerules: Move shared library building before objects rules, so versions are known before extra-lib.mk gets included. * extra-lib.mk (lib-noranlib): Depend on the shared object too. * pwd/getpwuid.c: Rewritten using nss. * pwd/getpwnam.c: Likewise. * pwd/getpwent.c: Likewise. * grp/getgrnam.c: Likewise. * grp/getgrgid.c: Likewise. * grp/getgrent.c: Likewise. * pwd/Makefile (routines): Add getpwent_r, getpwnam_r, getpwuid_r. * pwd/getpwent_r.c: New file. * pwd/getpwnam_r.c: New file. * pwd/getpwuid_r.c: New file. * grp/Makefile (routines): Add getgrent_r, getgrgid_r, getgrnam_r. * grp/getgrnam_r.c: New file. * grp/getgrgid_r.c: New file. * grp/getgrent_r.c: New file. * grp/Makefile (routines): Remove grpopen, grpread. * pwd/Makefile (routines): Remove pwdopen, pwdread. * grp/grpopen.c, grp/grpread.c, pwd/pwdopen.c, pwd/pwdread.c: Removed. * pwd/fgetpwent.c: Rewritten using files-parse.c. * grp/fgetgrent.c: Likewise. * nss/Makefile (routines): Add grp-lookup and pwd-lookup. * nss/pwd-lookup.c, nss/grp-lookup.c: New files. * nss/nss_files/files-grp.c: New file. * nss/nss_files/files-pwd.c: New file. * nss/Makefile (subdir-dirs): New variable; use it in vpath. * nss/nss_files/files-parse.c: New file. * nss/nss_files/files-XXX.c: New file. * nss/nss_files/files-hosts.c, nss/nss_files/files-proto.c, nss/nss_files/files-service.c, nss/nss_files/files-network.c: Rewritten using them. * nss/Makefile (libnss_files-routines): Remove files-host. Add files-hosts, files-grp, files-pwd. * nss/nss_dns/dns-network.c: Don't include . Mon Jun 24 22:39:12 1996 Richard Henderson * sysdeps/alpha/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): A .plt entry now loads the .rela.plt offset directly rather than making us calculate it. Sun Jun 23 15:24:05 1996 Roland McGrath * time/Makefile ($(installed-localtime-file) rule): Do $(make-target-directory) first. * resolv.h: Fix wrapper for resolv/resolv.h. * configure.in (ld --no-whole-archive check): Use AC_TRY_COMMAND. Compile dummy file and pass -nostdlib -nostartfiles so as not to require installed libraries. * shlib-versions (*-*-*): Set libresolv=2, libnss_files=1, libnss_dns=1. Sun Jun 23 19:42:05 1996 Ulrich Drepper * resolv/netdb.h (_PATH_NSSWITCH_CONF): New macro. * inet/herrno.c: New file. * resolv/res_init.c: Remove res_hconf calls. * nss/Makefile, nss/XXX-lookup.c, nss/file-lookup.c, nss/getXXbyYY.c, nss/getXXbyYY_r.c, nss/getXXent.c, nss/getXXent_r.c, nss/host-lookup.c, nss/network-lookup.c, nss/nsswitch.c, nss/nsswitch.h, nss/proto-lookup.c, nss/service-lookup.c: New files. Implementation of name service switch, following the approach in Solaris. Interface specification and general structure inspired by Peter Eriksson . * nss/nss_files/files-host.c, nss/nss_files/files-network.c, nss/nss_files/files-proto.c, nss/nss_files/files-service.c: Implementation of libnss_files.so module for file based databases in NSS service. * nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Implementation if libnss_dns.so module for DNS name lookup in NSS service. * inet/getproto.c, inet/getprtent.c, inet/getprtname.c, inet/getservent.c, inet/getsrvbynm.c, inet/getsrvbypt.c: Changed to serve as interface to NSS. * inet/gethstbyad.c, inet/gethstbyad_r.c, inet/gethstbynm.c, inet/gethstbynm2.c, inet/gethstbynm2_r.c, inet/gethstbynm_r.c, inet/gethstent.c, inet/gethstent_r.c, inet/getnetbynm.c, inet/getnetbynm_r.c, inet/getnetbypt.c, inet/getnetbypt_r.c, inet/getnetent.c, inet/getnetent_r.c, inet/getproto_r.c, inet/getprtent_r.c, inet/getprtname_r.c, inet/getservent_r.c, inet/getsrvbynm_r.c, inet/getsrvbypt_r.c: New files. Implement interfaces to NSS, including reentrant functions. * resolv/getnetbyaddr.c, resolv/getnetbyname.c, resolv/getnetent.c, resolv/sethostent.c: Removed: Obsoleted by NSS. * resolv/mapv4v6addr.h, resolv/mapv4v6hostent.h: Extracted from gethnamaddr.c. These private functions are now used in more than one file. * resolv/inet_pton.c, resolv/gethnamaddr.c: Updated to bind-4.9.4-T5B. Sat Jun 22 16:49:47 1996 Andreas Schwab * rpm/Makefile ($(config)): Make sure the word list in the for loop is syntactically non-empty. --- pwd/Makefile | 6 ++- pwd/fgetpwent.c | 53 ++++++++++++++------ pwd/getpwent.c | 59 +++++----------------- pwd/getpwent_r.c | 30 ++++++++++++ pwd/getpwnam.c | 30 +++++------- pwd/getpwnam_r.c | 30 ++++++++++++ pwd/getpwuid.c | 30 +++++------- pwd/getpwuid_r.c | 30 ++++++++++++ pwd/pwdopen.c | 28 ----------- pwd/pwdread.c | 147 ------------------------------------------------------- 10 files changed, 168 insertions(+), 275 deletions(-) create mode 100644 pwd/getpwent_r.c create mode 100644 pwd/getpwnam_r.c create mode 100644 pwd/getpwuid_r.c delete mode 100644 pwd/pwdopen.c delete mode 100644 pwd/pwdread.c (limited to 'pwd') 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 -#include -#include -#include #include -#include #include +/* 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 , 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 -#include -#include #include -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 , 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 + + +#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 , 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 -#include -#include -#include #include -/* 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 , 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 + + +#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 , 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 -#include -#include #include -#include -/* 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/getpwuid_r.c b/pwd/getpwuid_r.c new file mode 100644 index 0000000000..e3bf7578ae --- /dev/null +++ b/pwd/getpwuid_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 , 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 + + +#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/pwdopen.c b/pwd/pwdopen.c deleted file mode 100644 index 6d35ab9441..0000000000 --- a/pwd/pwdopen.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 1991 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 -#include -#include - -/* Return a new stream open on the password file. */ -FILE * -DEFUN_VOID(__pwdopen) -{ - return(fopen("/etc/passwd", "r")); -} 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 -#include -#include -#include -#include -#include -#include -#include -#include - - -/* 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; -} -- cgit 1.4.1