diff options
Diffstat (limited to 'pwd')
| -rw-r--r-- | pwd/Makefile | 2 | ||||
| -rw-r--r-- | pwd/fgetpwent.c | 38 | ||||
| -rw-r--r-- | pwd/getpwent.c | 2 | ||||
| -rw-r--r-- | pwd/getpwent_r.c | 4 | ||||
| -rw-r--r-- | pwd/getpwnam.c | 2 | ||||
| -rw-r--r-- | pwd/getpwnam_r.c | 2 | ||||
| -rw-r--r-- | pwd/getpwuid.c | 2 | ||||
| -rw-r--r-- | pwd/getpwuid_r.c | 2 | ||||
| -rw-r--r-- | pwd/pwd.h | 11 |
9 files changed, 21 insertions, 44 deletions
diff --git a/pwd/Makefile b/pwd/Makefile index ce67d49ea9..68cdc4a991 100644 --- a/pwd/Makefile +++ b/pwd/Makefile @@ -23,6 +23,6 @@ subdir := pwd routines := fgetpwent getpw putpwent \ getpwent getpwnam getpwuid \ - getpwent_r getpwnam_r getpwuid_r + getpwent_r getpwnam_r getpwuid_r fgetpwent_r include ../Rules diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index f8548fe29b..215d6e07c8 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -16,27 +16,8 @@ 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 <stdio.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, 0); - STRING_FIELD (result->pw_passwd, ISCOLON, 0); - INT_FIELD (result->pw_uid, ISCOLON, 0, 10,); - INT_FIELD (result->pw_gid, ISCOLON, 0, 10,); - STRING_FIELD (result->pw_gecos, ISCOLON, 0); - STRING_FIELD (result->pw_dir, ISCOLON, 0); - result->pw_shell = line; - ) +#include <stdio.h> /* Read one entry from the given stream. */ @@ -45,21 +26,6 @@ fgetpwent (FILE *stream) { static char buffer[BUFSIZ]; static struct passwd result; - char *p; - - do - { - 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 &result; + return __fgetpwent_r (stream, &result, buffer, sizeof buffer); } diff --git a/pwd/getpwent.c b/pwd/getpwent.c index 79edbd5db0..9b96c63c33 100644 --- a/pwd/getpwent.c +++ b/pwd/getpwent.c @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define GETFUNC_NAME getpwent #define ENDFUNC_NAME endpwent #define DATABASE_NAME passwd -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXent.c" diff --git a/pwd/getpwent_r.c b/pwd/getpwent_r.c index ced7f8a639..1c5bc02e7a 100644 --- a/pwd/getpwent_r.c +++ b/pwd/getpwent_r.c @@ -8,7 +8,7 @@ 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 +but WITHOUT ANY WARRANTY; without even the implied warranty of/tes MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define GETFUNC_NAME getpwent #define ENDFUNC_NAME endpwent #define DATABASE_NAME passwd -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXent_r.c" diff --git a/pwd/getpwnam.c b/pwd/getpwnam.c index 597b8d1205..042fdae206 100644 --- a/pwd/getpwnam.c +++ b/pwd/getpwnam.c @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define DATABASE_NAME passwd #define ADD_PARAMS const char *name #define ADD_VARIABLES name -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXbyYY.c" diff --git a/pwd/getpwnam_r.c b/pwd/getpwnam_r.c index c2d1f84d81..93fadc5ed1 100644 --- a/pwd/getpwnam_r.c +++ b/pwd/getpwnam_r.c @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define DATABASE_NAME passwd #define ADD_PARAMS const char *name #define ADD_VARIABLES name -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXbyYY_r.c" diff --git a/pwd/getpwuid.c b/pwd/getpwuid.c index 130c251f89..2ad654f9b9 100644 --- a/pwd/getpwuid.c +++ b/pwd/getpwuid.c @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define DATABASE_NAME passwd #define ADD_PARAMS uid_t uid #define ADD_VARIABLES uid -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXbyYY.c" diff --git a/pwd/getpwuid_r.c b/pwd/getpwuid_r.c index e3bf7578ae..8e92ee2555 100644 --- a/pwd/getpwuid_r.c +++ b/pwd/getpwuid_r.c @@ -25,6 +25,6 @@ Boston, MA 02111-1307, USA. */ #define DATABASE_NAME passwd #define ADD_PARAMS uid_t uid #define ADD_VARIABLES uid -#define BUFLEN 1024 +#define BUFLEN NSS_BUFLEN_PASSWD #include "../nss/getXXbyYY_r.c" diff --git a/pwd/pwd.h b/pwd/pwd.h index 00235093aa..9bd380a6db 100644 --- a/pwd/pwd.h +++ b/pwd/pwd.h @@ -123,6 +123,17 @@ extern struct passwd *getpwnam_r __P ((__const char *__name, struct passwd *__resultbuf, char *__buffer, int __buflen)); + +#ifdef __USE_SVID +/* Read an entry from STREAM. */ +extern struct passwd *__fgetpwent_r __P ((FILE * __stream, + struct passwd *__resultbuf, + char *__buffer, int __buflen)); +extern struct passwd *fgetpwent_r __P ((FILE * __stream, + struct passwd *__resultbuf, + char *__buffer, int __buflen)); +#endif + #endif /* reentrant */ |