From ffee131630368bc2600747346d0b03025cbca6ee Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 2 Jul 1996 17:43:35 +0000 Subject: Tue Jul 2 10:44:37 1996 Roland McGrath * pwd/fgetpwent.c: Don't include ../nss/nss_files/files-parse.c to define parse_line function. (parse_line): #define to _nss_files_parse_pwent and add extern decl for that. * nss/nss_files/files-XXX.c (internal_getent): Return NSS_STATUS_TRYAGAIN for ERANGE error. * sysdeps/i386/strtok.S (LreturnNULL): Save current state ptr instead of null, so next round returns null again instead of bombing. Fix from drepper. * nss/nss_files/files-parse.c (LINE_PARSER): Take new first arg EOLSET. Remove ; after `ENTDATA_DECL (data)'. Truncate line at strpbrk (line, EOLSET "\n"). (ENTDATA_DECL): Put ; at end. (MIDLINE_COMMENTS): Macro removed. * nss/nss_files/files-ethers.c: Pass new argument. * nss/nss_files/files-hosts.c: Likewise. * nss/nss_files/files-network.c: Likewise. * nss/nss_files/files-parse.c: Likewise. * nss/nss_files/files-proto.c: Likewise. * nss/nss_files/files-rpc.c: Likewise. * nss/nss_files/files-service.c: Likewise. * grp/fgetgrent.c: Likewise. * pwd/fgetpwent.c: Likewise. * nss/nss_files/files-pwd.c: Get parse_line with extern decl, since fgetpwent.c already defines it. * nss/nss_files/files-grp.c: Likewise. * elf/dl-load.c (_dl_map_object): Use any object with matching l_name as well as any matching with l_libname. Fix DT_SONAME lookup to use string table properly. * elf/rtld.c (dl_main): Set _dl_rtld_map.l_name from _dl_argv[0] when invoked directly, and l_libname from that if PT_INTERP missing. Set l_name from l_libname only if not set from argv. * time/europe, time/northamerica: Updated from ADO 96i. * stdio-common/tst-ungetc.c: Include unistd.h. --- pwd/fgetpwent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pwd/fgetpwent.c') diff --git a/pwd/fgetpwent.c b/pwd/fgetpwent.c index c29e96e..f8548fe 100644 --- a/pwd/fgetpwent.c +++ b/pwd/fgetpwent.c @@ -28,7 +28,7 @@ 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,); @@ -36,7 +36,7 @@ LINE_PARSER STRING_FIELD (result->pw_gecos, ISCOLON, 0); STRING_FIELD (result->pw_dir, ISCOLON, 0); result->pw_shell = line; -) + ) /* Read one entry from the given stream. */ -- cgit v1.1