mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 11:20:07 +00:00
14ea22e96c
1998-02-15 Ulrich Drepper <drepper@cygnus.com> * nss/nsswitch.c (__nss_lookup): Return 1 if this was the last module. * nss/getXXent_r.c: If no more module is found don't try to call setXXent functions but leave unsuccessfully. * malloc/obstack.h: Cleanups. * sysdeps/wordsize-32/stdint.h: New file. * sysdeps/wordsize-64/stdint.h: New file. * sysdeps/generic/stdint.h: New file. * sysdeps/wordsize-32/inttypes.h: Adopt to use stdint.h. * sysdeps/wordsize-64/inttypes.h: Likewise. * stdlib/Makefile (headers): Add stdint.h. 1998-02-03 Paul Eggert <eggert@twinsun.com> * malloc/obstack.h (PTR_INT_TYPE): Use __PTRDIFF_TYPE__ if available. 1998-02-13 17:59 Zack Weinberg <zack@rabi.phys.columbia.edu> * timezone: New directory. * time/README, time/africa, time/antarctica, time/asia, time/australasia, time/backward, time/checktab.awk, time/etcetera, time/europe, time/factory, time/ialloc.c, time/iso3166.tab, time/leapseconds, time/northamerica, time/pacificnew, time/private.h, time/scheck.c, time/solar87, time/solar88, time/solar89, time/southamerica, time/systemv, time/test-tz.c, time/tzfile.h, time/tzselect.ksh, time/yearistype, time/zdump.c, time/zic.c, time/zone.tab: Moved to timezone. * time/tzfile.c: Include tzfile.h from timezone subdir. * time/tzset.c: Likewise. * time/Makefile: Cut out all code relating to timezones... * timezone/Makefile: ...and paste it in here. * Makefile (subdirs): Add timezone. 1998-02-13 18:45 H.J. Lu <hjl@gnu.org> * libc.map (_sys_nerr): Added. * sysdeps/unix/sysv/linux/errlist.c (_sys_nerr): Make it versioned symbol. 1998-02-15 17:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/bits/socket.h: Define PF_KEY and pseudo_AF_KEY instead of pseudo_PF_KEY and AF_KEY. Reported by Craig Metz <cmetz@inner.net>. 1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * nss/nss_files/files-parse.c (LOOKUP_NAME_CASE): Use __strcasecmp instead of strcasecmp. * nss/nss_files/files-alias.c (get_next_alias): Likewise. * wctype/wctype.h (_ISwbit): Avoid warning with gcc before 2.8. 1998-02-15 16:55 Ulrich Drepper <drepper@cygnus.com> * socket/sys/socket.h (setsockopt): Make OPTVAL parameter const. Patch by Dean Gaudet <dgaudet@arctic.org>. 1998-02-15 16:53 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/Dist: Add getresgid.c and getresuid.c. 1998-02-15 10:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * sysdeps/unix/sysv/linux/poll.c: If compiled against a kernel with no poll syscall, just include the BSD version. * sysdeps/unix/sysv/linux/getresuid.c: If compiled against a kernel without the syscall, include the stub version. * sysdeps/unix/sysv/linux/getresgid.c: Likewise. * sysdeps/generic/getresuid.c: New file. * sysdeps/generic/getresgid.c: New file. 1998-02-15 Ulrich Drepper <drepper@cygnus.com> * stdio-common/vfscanf.c: Correct last change a bit.
252 lines
7.3 KiB
C
252 lines
7.3 KiB
C
/* Common code for file-based database parsers in nss_files module.
|
|
Copyright (C) 1996, 1997, 1998 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., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
/* These symbols are defined by the including source file:
|
|
|
|
ENTNAME -- database name of the structure and functions (hostent, pwent).
|
|
STRUCTURE -- struct name, define only if not ENTNAME (passwd, group).
|
|
DATABASE -- string of the database file's name ("hosts", "passwd").
|
|
|
|
ENTDATA -- if defined, `struct ENTDATA' is used by the parser to store
|
|
things pointed to by the resultant `struct STRUCTURE'.
|
|
|
|
NEED_H_ERRNO - defined iff an arg `int *herrnop' is used.
|
|
|
|
Also see files-XXX.c. */
|
|
|
|
#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
|
|
|
|
|
|
#ifdef EXTERN_PARSER
|
|
|
|
/* The parser is defined in a different module. */
|
|
extern int parse_line (char *line, struct STRUCTURE *result,
|
|
struct parser_data *data, size_t datalen, int *errnop);
|
|
|
|
# define LINE_PARSER(EOLSET, BODY) /* Do nothing */
|
|
|
|
#else
|
|
|
|
/* Define a line parsing function. */
|
|
|
|
# define LINE_PARSER(EOLSET, BODY) \
|
|
parser_stclass int \
|
|
parse_line (char *line, struct STRUCTURE *result, \
|
|
struct parser_data *data, size_t datalen, int *errnop) \
|
|
{ \
|
|
ENTDATA_DECL (data) \
|
|
char *p = strpbrk (line, EOLSET "\n"); \
|
|
if (p != NULL) \
|
|
*p = '\0'; \
|
|
BODY; \
|
|
TRAILING_LIST_PARSER; \
|
|
return 1; \
|
|
}
|
|
|
|
|
|
# define STRING_FIELD(variable, terminator_p, swallow) \
|
|
{ \
|
|
variable = line; \
|
|
while (*line != '\0' && !terminator_p (*line)) \
|
|
++line; \
|
|
if (*line != '\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 INT_FIELD_MAYBE_NULL(variable, terminator_p, swallow, base, convert, default) \
|
|
{ \
|
|
char *endp; \
|
|
if (*line == '\0') \
|
|
/* We expect some more input, so don't allow the string to end here. */ \
|
|
return 0; \
|
|
variable = convert (strtol (line, &endp, base)); \
|
|
if (endp == line) \
|
|
variable = default; \
|
|
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, errnop); \
|
|
if (list) \
|
|
result->TRAILING_LIST_MEMBER = list; \
|
|
else \
|
|
return -1; /* -1 indicates we ran out of space. */ \
|
|
}
|
|
|
|
static inline char **
|
|
parse_list (char *line, struct parser_data *data, size_t datalen, int *errnop)
|
|
{
|
|
char *eol, **list, **p;
|
|
|
|
if (line >= data->linebuffer && line < (char *) data + datalen)
|
|
/* Find the end of the line buffer, we will use the space in DATA after
|
|
it for storing the vector of pointers. */
|
|
eol = strchr (line, '\0') + 1;
|
|
else
|
|
/* LINE does not point within DATA->linebuffer, so that space is
|
|
not being used for scratch space right now. We can use all of
|
|
it for the pointer vector storage. */
|
|
eol = data->linebuffer;
|
|
/* 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 ((size_t) ((char *) &p[1] - (char *) data) > datalen)
|
|
{
|
|
/* We cannot fit another pointer in the buffer. */
|
|
*errnop = ERANGE;
|
|
return NULL;
|
|
}
|
|
if (*line == '\0')
|
|
break;
|
|
|
|
/* Skip leading white space. This might not be portable but useful. */
|
|
while (isspace (*line))
|
|
++line;
|
|
|
|
elt = line;
|
|
while (1)
|
|
{
|
|
if (*line == '\0' || TRAILING_LIST_SEPARATOR_P (*line))
|
|
{
|
|
/* End of the next entry. */
|
|
if (line > elt)
|
|
/* We really found some data. */
|
|
*p++ = elt;
|
|
|
|
/* Terminate string if necessary. */
|
|
if (*line != '\0')
|
|
*line++ = '\0';
|
|
break;
|
|
}
|
|
++line;
|
|
}
|
|
}
|
|
*p = NULL;
|
|
|
|
return list;
|
|
}
|
|
|
|
# endif /* TRAILING_LIST_MEMBER */
|
|
#endif /* EXTERN_PARSER */
|
|
|
|
|
|
#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; \
|
|
}
|
|
|
|
#define LOOKUP_NAME_CASE(nameelt, aliaselt) \
|
|
{ \
|
|
char **ap; \
|
|
if (! __strcasecmp (name, result->nameelt)) \
|
|
break; \
|
|
for (ap = result->aliaselt; *ap; ++ap) \
|
|
if (! strcasecmp (name, *ap)) \
|
|
break; \
|
|
if (*ap) \
|
|
break; \
|
|
}
|
|
|
|
|
|
/* This is defined by db-*.c to include "../nss_db/db-XXX.c" instead. */
|
|
#ifndef GENERIC
|
|
# define GENERIC "files-XXX.c"
|
|
#endif
|