mirror of
https://sourceware.org/git/glibc.git
synced 2025-04-21 23:06:08 +03:00
* 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.
183 lines
4.7 KiB
C
183 lines
4.7 KiB
C
/* Common code for file-based database parsers in nss_files module.
|
|
Copyright (C) 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
|
|
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 <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
|
|
#define CONCAT(a,b) CONCAT1(a,b)
|
|
#define CONCAT1(a,b) a##b
|
|
|
|
#ifndef STRUCTURE
|
|
#define STRUCTURE ENTNAME
|
|
#endif
|
|
|
|
|
|
struct parser_data
|
|
{
|
|
#ifdef ENTDATA
|
|
struct ENTDATA entdata;
|
|
#define ENTDATA_DECL(data) struct ENTDATA *const entdata = &data->entdata;
|
|
#else
|
|
#define ENTDATA_DECL(data)
|
|
#endif
|
|
char linebuffer[0];
|
|
};
|
|
|
|
#ifdef ENTDATA
|
|
/* The function can't be exported, because the entdata structure
|
|
is defined only in files-foo.c. */
|
|
#define parser_stclass static inline
|
|
#else
|
|
/* Export the line parser function so it can be used in nss_db. */
|
|
#define parser_stclass /* Global */
|
|
#define parse_line CONCAT(_nss_files_parse_,ENTNAME)
|
|
#endif
|
|
|
|
#define LINE_PARSER(EOLSET, BODY) \
|
|
parser_stclass int \
|
|
parse_line (char *line, struct STRUCTURE *result, \
|
|
struct parser_data *data, int datalen) \
|
|
{ \
|
|
ENTDATA_DECL (data) \
|
|
char *p = strpbrk (line, EOLSET "\n"); \
|
|
if (p) \
|
|
*p = '\0'; \
|
|
BODY; \
|
|
TRAILING_LIST_PARSER; \
|
|
return 1; \
|
|
}
|
|
|
|
|
|
#define STRING_FIELD(variable, terminator_p, swallow) \
|
|
{ \
|
|
variable = line; \
|
|
while (!terminator_p (*line)) \
|
|
if (*++line == '\0') \
|
|
return 0; \
|
|
*line = '\0'; \
|
|
do \
|
|
++line; \
|
|
while (swallow && terminator_p (*line)); \
|
|
}
|
|
|
|
#define INT_FIELD(variable, terminator_p, swallow, base, convert) \
|
|
{ \
|
|
char *endp; \
|
|
variable = convert (strtol (line, &endp, base)); \
|
|
if (endp == line) \
|
|
return 0; \
|
|
else if (terminator_p (*endp)) \
|
|
do \
|
|
++endp; \
|
|
while (swallow && terminator_p (*endp)); \
|
|
else if (*endp != '\0') \
|
|
return 0; \
|
|
line = endp; \
|
|
}
|
|
|
|
#define ISCOLON(c) ((c) == ':')
|
|
|
|
|
|
#ifndef TRAILING_LIST_MEMBER
|
|
#define TRAILING_LIST_PARSER /* Nothing to do. */
|
|
#else
|
|
|
|
#define TRAILING_LIST_PARSER \
|
|
{ \
|
|
char **list = parse_list (line, data, datalen); \
|
|
if (list) \
|
|
result->TRAILING_LIST_MEMBER = list; \
|
|
else \
|
|
return 0; \
|
|
}
|
|
|
|
static inline char **
|
|
parse_list (char *line, struct parser_data *data, int datalen)
|
|
{
|
|
char *eol, **list, **p;
|
|
|
|
/* Find the end of the line buffer. */
|
|
eol = strchr (data->linebuffer, '\0') + 1;
|
|
/* Adjust the pointer so it is aligned for storing pointers. */
|
|
eol += __alignof__ (char *) - 1;
|
|
eol -= (eol - (char *) 0) % __alignof__ (char *);
|
|
/* We will start the storage here for the vector of pointers. */
|
|
list = (char **) eol;
|
|
|
|
p = list;
|
|
while (1)
|
|
{
|
|
char *elt;
|
|
|
|
if ((char *) &p[1] - (char *) data > datalen)
|
|
{
|
|
/* We cannot fit another pointer in the buffer. */
|
|
errno = ERANGE;
|
|
return NULL;
|
|
}
|
|
if (*line == '\0')
|
|
break;
|
|
|
|
elt = line;
|
|
while (1)
|
|
{
|
|
if (TRAILING_LIST_SEPARATOR_P (*line))
|
|
{
|
|
*p++ = elt;
|
|
*line = '\0';
|
|
do
|
|
++line;
|
|
while (TRAILING_LIST_SEPARATOR_P (*line));
|
|
elt = line;
|
|
}
|
|
else if (*line == '\0' || *line == '\n')
|
|
{
|
|
/* End of the line. */
|
|
if (line > elt)
|
|
/* Last element. */
|
|
*p++ = elt;
|
|
*line = '\0';
|
|
break;
|
|
}
|
|
else
|
|
++line;
|
|
}
|
|
}
|
|
*p = NULL;
|
|
|
|
return list;
|
|
}
|
|
|
|
#define LOOKUP_NAME(nameelt, aliaselt) \
|
|
{ \
|
|
char **ap; \
|
|
if (! strcmp (name, result->nameelt)) \
|
|
break; \
|
|
for (ap = result->aliaselt; *ap; ++ap) \
|
|
if (! strcmp (name, *ap)) \
|
|
break; \
|
|
if (*ap) \
|
|
break; \
|
|
}
|
|
|
|
#endif
|