diff options
| author | Roland McGrath <roland@gnu.org> | 1996-07-02 17:43:35 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-07-02 17:43:35 +0000 |
| commit | ffee131630368bc2600747346d0b03025cbca6ee (patch) | |
| tree | 4e496094645ba4e4d744868167cd0f79f118aa05 /nss/nss_files/files-parse.c | |
| parent | eb48c9632eb9b40b0855003d48e5547c542d2abe (diff) | |
| download | glibc-ffee131630368bc2600747346d0b03025cbca6ee.tar.gz | |
Tue Jul 2 10:44:37 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* 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.
Diffstat (limited to 'nss/nss_files/files-parse.c')
| -rw-r--r-- | nss/nss_files/files-parse.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c index be35ae1a8a..a9c461ef46 100644 --- a/nss/nss_files/files-parse.c +++ b/nss/nss_files/files-parse.c @@ -35,7 +35,7 @@ struct parser_data { #ifdef ENTDATA struct ENTDATA entdata; -#define ENTDATA_DECL(data) struct ENTDATA *const entdata = &data->entdata +#define ENTDATA_DECL(data) struct ENTDATA *const entdata = &data->entdata; #else #define ENTDATA_DECL(data) #endif @@ -52,26 +52,21 @@ struct parser_data #define parse_line CONCAT(_nss_files_parse_,ENTNAME) #endif -#define LINE_PARSER(BODY) \ +#define LINE_PARSER(EOLSET, BODY) \ parser_stclass int \ parse_line (char *line, struct STRUCTURE *result, \ struct parser_data *data, int datalen) \ { \ - ENTDATA_DECL (data); \ + ENTDATA_DECL (data) \ + char *p = strpbrk (line, EOLSET "\n"); \ + if (p) \ + *p = '\0'; \ BODY; \ TRAILING_LIST_PARSER; \ return 1; \ } -/* Comments can come mid-line; trim the line at the first # seen. */ -#define MIDLINE_COMMENTS \ - { \ - char *p = strchr (line, '#'); \ - if (p) \ - *p = '\0'; \ - } - #define STRING_FIELD(variable, terminator_p, swallow) \ { \ variable = line; \ |