mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
Wed Oct 9 00:30:33 1996 Ulrich Drepper <drepper@cygnus.com> * inet/getnetgrent_r.c: Correct netgroup implementation. A specification of a netgroup can also name another netgroup. * nss/nss_files/files-netgrp.c: Likewise. * inet/netgroup.h: Add fields to hold additional information. Tue Oct 8 21:51:14 1996 Arnold D. Robbins <arnold@skeeve.atl.ga.us> * posix/getopt.c: Implement POSIX -W option handling. When the option string contains "W;" -W foo is handled like --foo. Tue Oct 8 12:27:26 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/clone.S: Define _ERRNO_H before inclusing <errnos.h> so we really get error symbols defined. * sysdeps/unix/sysv/linux/m68k/clone.S: Likewise. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sunrpc/auth_unix.c (authunix_create_default): Don't use fixed size array for getgroups call. Instead get maximal number via sysconf. But discard list to NGRPS elements before calling XDR function since Sun's code cannot handle longer lists. Based on a patch by Thorsten Kukuk <kukuk@weber.uni-paderborn.de>. * sysdeps/stub/e_j0l.c: Define y0l as well. * sysdeps/stub/e_j1l.c: Define y1l as well. * sysdeps/stub/e_jnl.c: Define ynl as well. * posix/unistd.h: Correct prototype for execlp. * sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_NO_TRUNC. Mon Oct 7 22:18:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makeconfig (sysdep-library-path): New variable. (built-program-cmd): Use it here to properly build a colon separated library path. Mon Oct 7 22:11:55 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * crypt/md5-crypt.c (md5_crypt_r): Add missing parens around & within comparison. Fix comments. (md5_crypt): Fix comment. Tue Oct 8 05:10:49 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/errnos.h: Only include <linux/errnos.h> when _ERRNO_H is defined. [!_ERRNO_H && __need_Emath]: Define value for EDOM and ERANGE. Should there ever be a Linux port where the numeric values are not 33 and 34 this file must change. Mon Oct 7 13:54:04 1996 Ulrich Drepper <drepper@cygnus.com> * libio/iofgets.c (_IO_fgets): Use _IO_flockfile instead of __flockfile. Mon Oct 7 11:01:45 1996 Andreas Jaeger <aj@arthur.pfalz.de> * string/tst-strlen.c (main): Provide prototype. * malloc/mallocbug.c: Likewise. * io/test-utime.c: Likewise. * sysdeps/generic/crypt-entry.c: Correct typo. Mon Oct 7 13:42:20 1996 Ulrich Drepper <drepper@cygnus.com> * elf/dl-open.c (_dl_open): Check against _dl_sysdep_start to test for libc.a. Checking _DYNAMIC is of no worth here. Suggested by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>. * nss/nss_files/files-parse.c: Define LOOKUP_NAME even if EXTERN_PARSER is defined. Sat Oct 5 17:05:36 1996 Andreas Jaeger <aj@arthur.pfalz.de> * Rules (dep-dummy-lib): Correct prototype for __dummy__. * crypt/md5-crypt.c: Fix typos in comments. * gmon/gmon.c: Provide prototypes. * db/makedb.c: Likewise. * locale/programs/xmalloc.c: Likewise. * stdio-common/bug11.c (main): Likewise. * stdio-common/bug7.c (main): Likewise. * stdio-common/bug8.c (main): Likewise. * stdio-common/bug9.c (main): Likewise. * stdio-common/scanf1.c (main): Likewise. * stdio-common/scanf2.c (main): Likewise. * stdio-common/scanf5.c (main): Likewise. * stdio-common/scanf6.c (main): Likewise. * stdio-common/scanf7.c (main): Likewise. * stdio-common/scanf8.c (main): Likewise. * stdio-common/temptest.c (main): Likewise. * stdio-common/test-fwrite.c (main): Likewise. * stdio-common/tst-printf.c: Likewise. * stdio-common/tstdiomisc.c: Likewise. * stdio-common/tstgetln.c (main): Likewise. * stdlib/testmb.c (main): Likewise. * stdio-common/scanf4.c (main): Correct prototype, remove unused variable n. * stdio-common/scanf3.c (main): Correct prototype, change declaration of s to reduce warnings. * stdio-common/bug10.c (main): Likewise. * stdio-common/tfformat.c: Provide prototype, remove unused reference to dump_stats, add braces in sprint_doubles. * stdio-common/tiformat.c: Likewise. * stdio-common/test_rdwr.c (main): Parameter `where' is long in printf call. Mon Oct 7 14:04:26 1996 NIIBE Yutaka <gniibe@mri.co.jp> * sysdeps/unix/sysv/linux/sys/soundcard.h: Fix typo. * shadow/putspent.c: Don't write colon after flag field. * sysdeps/unix/sysv/linux/net/if_ppp.h: New file. Wrapper around kernel header. * sysdeps/unix/sysv/linux/net/ppp-comp.h: Likewise. * sysdeps/unix/sysv/linux/net/ppp_defs.h: Likewise. * sysdeps/unix/sysv/linux/Dist: Mention new files. Mon Oct 7 00:58:19 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/i586/strchr.S: Correct handling of first bytes to get pointer aligned. Reported by Matthias Urlichs <smurf@noris.de>. * sysdeps/posix/euidaccess.c [_LIBC]: Avoid calling get?id functions by using __libc_enable_secure variable. * sysdeps/libm-i387/s_copysignl.S: Correct loading of return value.
242 lines
6.8 KiB
C
242 lines
6.8 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>
|
|
|
|
/* 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, int datalen);
|
|
|
|
#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, 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 (*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); \
|
|
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;
|
|
|
|
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 ((char *) &p[1] - (char *) data > datalen)
|
|
{
|
|
/* We cannot fit another pointer in the buffer. */
|
|
__set_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;
|
|
}
|
|
|
|
#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; \
|
|
}
|
|
|
|
|
|
/* This is defined by db-*.c to include "../nss_db/db-XXX.c" instead. */
|
|
#ifndef GENERIC
|
|
#define GENERIC "files-XXX.c"
|
|
#endif
|