/* 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.
+ Copyright (C) 1996, 1997 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 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.
+ 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. */
+ 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
+# define STRUCTURE ENTNAME
#endif
struct parser_data
{
- struct CONCAT(ENTNAME,_data) entdata;
+#ifdef ENTDATA
+ struct ENTDATA entdata;
+# define ENTDATA_DECL(data) struct ENTDATA *const entdata = &data->entdata;
+#else
+# define ENTDATA_DECL(data)
+#endif
char linebuffer[0];
};
-#define LINE_PARSER(BODY) \
-static inline int \
+#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, int datalen) \
+ struct parser_data *data, size_t datalen, int *errnop) \
{ \
- struct CONCAT(ENTNAME,_data) *const entdata __attribute__ ((unused)) \
- = &data->entdata; \
+ ENTDATA_DECL (data) \
+ char *p = strpbrk (line, EOLSET "\n"); \
+ if (p != NULL) \
+ *p = '\0'; \
BODY; \
TRAILING_LIST_PARSER; \
return 1; \
}
-/* Comments can come mid-line; trim the line at the first # seen. */
-#define MIDLINE_COMMENTS \
- { \
- char *p = strchr (line, '#'); \
- if (p) \
- *p = '\0'; \
- }
-
-#define STRING_FIELD(variable, terminator_p, swallow) \
+# define STRING_FIELD(variable, terminator_p, swallow) \
{ \
variable = line; \
- while (!terminator_p (*line)) \
- if (*++line == '\0') \
- return 0; \
- *line = '\0'; \
- do \
+ while (*line != '\0' && !terminator_p (*line)) \
++line; \
- while (swallow && terminator_p (*line)); \
+ if (*line != '\0') \
+ { \
+ *line = '\0'; \
+ do \
+ ++line; \
+ while (swallow && terminator_p (*line)); \
+ } \
}
-#define INT_FIELD(variable, terminator_p, swallow, base, convert) \
+# define INT_FIELD(variable, terminator_p, swallow, base, convert) \
{ \
char *endp; \
variable = convert (strtol (line, &endp, base)); \
line = endp; \
}
-#define ISCOLON(c) ((c) == ':')
+# 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
+# ifndef TRAILING_LIST_MEMBER
+# define TRAILING_LIST_PARSER /* Nothing to do. */
+# else
-#define TRAILING_LIST_PARSER \
+# define TRAILING_LIST_PARSER \
{ \
- char **list = parse_list (line, data, datalen); \
+ char **list = parse_list (line, data, datalen, errnop); \
if (list) \
result->TRAILING_LIST_MEMBER = list; \
else \
- return 0; \
+ return -1; /* -1 indicates we ran out of space. */ \
}
static inline char **
-parse_list (char *line, struct parser_data *data, int datalen)
+parse_list (char *line, struct parser_data *data, size_t datalen, int *errnop)
{
char *eol, **list, **p;
- /* Find the end of the line buffer. */
- eol = strchr (line, '\0') + 1;
+ 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 += (eol - (char *) 0) % __alignof__ (char *);
+ eol += __alignof__ (char *) - 1;
+ eol -= (eol - (char *) 0) % __alignof__ (char *);
/* We will start the storage here for the vector of pointers. */
list = (char **) eol;
{
char *elt;
- if ((char *) &p[1] - (char *) data > datalen)
+ if ((size_t) ((char *) &p[1] - (char *) data) > datalen)
{
/* We cannot fit another pointer in the buffer. */
- errno = ERANGE;
+ *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 (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')
+ if (*line == '\0' || TRAILING_LIST_SEPARATOR_P (*line))
{
- /* End of the line. */
+ /* End of the next entry. */
if (line > elt)
- /* Last element. */
+ /* We really found some data. */
*p++ = elt;
- *line = '\0';
+
+ /* Terminate string if necessary. */
+ if (*line != '\0')
+ *line++ = '\0';
break;
}
- else
- ++line;
+ ++line;
}
}
*p = NULL;
return list;
}
+# endif /* TRAILING_LIST_MEMBER */
+#endif /* EXTERN_PARSER */
+
+
#define LOOKUP_NAME(nameelt, aliaselt) \
{ \
char **ap; \
break; \
}
+
+/* This is defined by db-*.c to include "../nss_db/db-XXX.c" instead. */
+#ifndef GENERIC
+# define GENERIC "files-XXX.c"
#endif
projects / kopensolaris-gnu / glibc.git / blobdiff