mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
f8b87ef0d4
Thu Dec 12 03:32:21 1996 Ulrich Drepper <drepper@cygnus.com> * libio/_G_config.h: Add definition of _G_int16_t, _G_int32_t, _G_uint16_t, _G_uin32_t, _G_HAVE_BOOL, _G_HAVE_MMAP, and _G_ARGS. Change libio buffer handling to allocate internal buffers using mmap if possible. * libio/filedoalloc.c (_IO_file_doallocate): Change call to ALLOC_BUF. * libio/genops.c (_IO_setb, _IO_default_finish): Change call to FREE_BUF. (_IO_default_doallocate): Change call to ALLOC_BUF. * libio/libioP.h: Change definition of ALLOC_BUF and FREE_BUF to use mmap/munmap when possible. * libio/memstream.c: Don't use ALLOC_BUF, but directly malloc. * libio/vasprintf.c: Likewise. Patch by HJ Lu. * libio/libio.h: Define NULL as __null only for gcc-2.8 and up. * libio/libioP.h: Likewise. * libio/fileops.c (_IO_file_read, _IO_file_write): Don't restart syscall when EINTR was returned. Necessary for POSIX.1. * libio/strops.c (_IO_str_overflow): Add cast to prevent warning. * new-malloc/malloc.c (heap_trim): Correctly place parentheses to prevent warnings. * nis/Makefile: Remove rules for bsd-tools which are not part of glibc. Patch by Thorsten Kukuk. * nis/ypclnt.c: Add prototype for xdr_free. Add const to first parameter for __yp_bind. * nis/nss_compat/compat-pwd.c (getpwent_next_netgr, getpwent_next_nis, getpwent_next_file): Variable `p2len' must have type size_t. * nis/nss_nis/nis-alias.c: Add casts to prevent warnings. * nis/nss_nis/nis-ethers.c: Likewise. * nis/nss_nis/nis-grp.c: Likewise. * nis/nss_nis/nis-hosts.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nss_nis/nis-proto.c: Likewise. * nis/nss_nis/nis-pwd.c: Likewise. * nis/nss_nis/nis-rpc.c: Likewise. * nis/nss_nis/nis-service.c: Likewise. * nis/nss_nis/nis-spwd.c: Likewise. * nis/rpcsvc/yp_prot.h (ypreq_key): Change type of members to `const char *'. (ypmaplist): Change member names to `map' and `next' and provide #defines for old names. Patch by Thorsten Kukuk. * nss/nss_files/files-parse.c (parse_line, parse_list): Change type for `datalen' parameter to size_t. * shsdow/lckpwdf.c: Use fcntl forlocking, not flock. * stdio-common/printf.c [USE_IN_LIBIO]: Provide alias _IO_printf for printf. * stdio-common/sscanf.c [USE_IN_LIBIO]: Provide alias _IO_sscanf for sscanf. Patch by HJ Lu. * stdio-common/tmpfile.c: Update copyright. * stdio-common/vfscanf.c: Correctly handle EINTR error from fgetc function. Don't eat white space for `C' format. * stdlib/tst-strtol.c [~0UL != 0xffffffff]: Fix typo in test data. * sysdeps/generic/abort.c: Update copyright. De-ANSI-declfy. * sysdeps/i386/abort.c: Removed. This version does not use signal SIGABRT. * sysdeps/i386/fpu/__math.h: Define __NO_MATH_INLINES if not using gcc-2.8 or up. Patch by HJ Lu. * sysdeps/posix/tempname.c: Test for error but EEXIST after open call. If EMFILE, ENFILE, or EINTR return with error. Wed Dec 11 14:43:52 1996 Ulrich Drepper <drepper@cygnus.com> * gnu-versions.h: Set _GNU_OBSTACK_INTERFACE_VERSION back to 1. We are compatible again. * new-malloc/obstack.h (struct obstack): Add back alloc_failed bit even though it is not used. * malloc/obstack.h: Likewise. * new-malloc/obstack.c (_obstack_begin, _obstack_begin_1): Initialize alloc_failed bit to 0. * time/strftime.c: Extend for Emacs' needs. Recognize field width, %P format and `0' modifier. Tue Dec 10 21:20:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (make-link): Don't discard exit codes of intermediate commands. Always use rellns-sh if symbolic links are available. Tue Dec 10 20:09:51 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/netinet/in.h: Enclose #include <linux/in.h> in __BEGIN_DECLS/__END_DECLS to avoid linkage conflict of ntohs etc. in <asm/byteorder.h>.
243 lines
6.8 KiB
C
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, size_t 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, size_t datalen) \
|
|
{ \
|
|
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); \
|
|
if (list) \
|
|
result->TRAILING_LIST_MEMBER = list; \
|
|
else \
|
|
return 0; \
|
|
}
|
|
|
|
static inline char **
|
|
parse_list (char *line, struct parser_data *data, size_t 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 ((size_t) ((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 (isspace (*line));
|
|
elt = line;
|
|
}
|
|
else if (*line == '\0')
|
|
{
|
|
/* 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
|