glibc/nss/nss_files/files-parse.c
Ulrich Drepper 2303f5fdd9 update from main archive 961109
Sun Nov 10 02:37:15 1996  Ulrich Drepper  <drepper@cygnus.com>

	* inet/gethstent_r.c: Update copyright.
	* nss/getXXbyYY_r.c: Likewise.
	* nss/nsswitch.c: Likewise.
	* nss/getXXent_r.c: Likewise.
	* nss/nss_files/files-XXX.c: Likewise.
	* nss/nss_files/files-netgroup.c: Likewise.
	* nss/nss_files/files-parse.c: Likewise.

	* nss/getXXent_r.c: Change implementation.  It's not necessary to
	call all setXXent functions.  Just find first available and
	when necessary let getXXent_r call the others.

	* nss/nss_files/files-XXX.c: Make really reentrant.  Now calls
	of getXXent and getXXbyYY can be mixed.  The cursor for traversing
	the database with getXXent will be remembered.

	* stdlib/test-canon.c (cwd): Change size to PATH_MAX.

Sat Nov  9 15:34:48 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/Dist: Add sys/mtio.h.
	* sysdeps/unix/sysv/linux/sys/mtio.h: New file.

	* signal/signal.h [__USE_BSD]: Add prototype for siggetmask.

Fri Nov  8 13:29:30 1996  Ulrich Drepper  <drepper@cygnus.com>

	* ctype/ctype.h (__isascii): Don't test for seventh bit not to be
	set.  Instead for none beside the first seven bits to be set.
	X/Open allows the argument to be an `int' value.
	Reported by Alain Williams <addw@phcomp.co.uk>.
	(toascii, isascii): Define macro also when __USE_XOPEN.

	* sysdeps/posix/fpathconf.c: Use fstatfs to compute NAME_MAX, not
	PATH_MAX.

Thu Nov  7 03:04:29 1996  Ulrich Drepper  <drepper@cygnus.com>

	* nss/getXXXent_r.c (SETFUNC_NAME): Reset `nip' after loop to
	NULL so that GETFUNC will see first entry.
	(ENDFUNC_NAME): Likewise.

	Rewrite Netgroups implementation to avoid global data.
	* inet/netgroup.h: Add definition of name_list and struct
	__netgrent.
	Add prototypes for internal netgroup functions.
	* nss/nss_files/files-netgroup.c (_nss_files_setnetgrent): Take
	extra argument and use the included data instead of global vars.
	(_nss_files_endnetgrent): Likewise.
	(_nss_netgroup_parseline): Change to be static and use data
	included in the RESULT structure.
	* inet/getnetgrent_r.c (startp): Move into setup function.
	(known_groups, needed_groups): new part of the __netgrent sruct.
	(freememory): Take extra argument and use included data.
	(__internal_endnetgrent): Likewise.
	(internal_setnetgrent): Renamed to __internal_setnetgrent_reuse
	and take extra argument.
	(__internal_setnetgrent): New function.  Call
	__internal_setnetgrent_reuse after calling free_memory.
	(setnetgrent): Only call __internal_setnetgrent.
	(__getnetgrent_r): Split into two functions.  __getnetgrent_r
	calls __internal_getnetgrent after locking.
	(innetgr): Use dynamic data only.  I.e., innetgr now is fully
	reentrant.

Thu Nov  7 00:15:14 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/stub/setenv.c: Correct typo: unseenv -> unsetenv.
	Reported by Joshua Cowan <jcowan@jcowan.reslife.okstate.edu>.

Wed Nov  6 13:13:37 1996  Ulrich Drepper  <drepper@cygnus.com>

	* manual/creature.texi: Document that _GNU_SOURCE is no longer the
	default when no *_SOURCE macro is given.
	Reported by Karsten Weiss <karsten@addx.au.s.shuttle.de>.
	* NOTES: remade from manual/creature.texi.
	* manual/libc.texinfo: Add back line about GPL translation which
	somehow got lost.

	* Make-dist (dist.tar): Depend on README being updated.

	* rellns-sh: Correct thinko in removing leading /.
	Reported by Andreas Jaeger <aj@arthur.pfalz.de>.

	* pwd/fgetpwent_r.c: Recognize lines containing only names starting
	with `+' or `-' in parser.
	* grp/fgetgrent_r.c: Likewise.
	* shadow/sgetspent_r.c: Likewise.
	* nss/nss_files/files-spwd.c: Don't accept entries starting with
	`+' or `-'.

	* sysdeps/stub/lchown.c: New file.
1996-11-10 02:21:51 +00:00

243 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., 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, 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