Do network lookups ignoring case.

[kopensolaris-gnu/glibc.git] / nss / nss_files / files-parse.c

diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
index 83a80f3..76df1c6 100644 (file)
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -1,5 +1,5 @@
 /* Common code for file-based database parsers in nss_files module.
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   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
@@ -69,7 +69,7 @@ struct parser_data
 
 /* The parser is defined in a different module.  */
 extern int parse_line (char *line, struct STRUCTURE *result,
-                      struct parser_data *data, int datalen);
+                      struct parser_data *data, size_t datalen, int *errnop);
 
 # define LINE_PARSER(EOLSET, BODY) /* Do nothing */
 
@@ -80,7 +80,7 @@ extern int parse_line (char *line, struct STRUCTURE *result,
 # 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)            \
 {                                                                            \
   ENTDATA_DECL (data)                                                        \
   char *p = strpbrk (line, EOLSET "\n");                                     \
@@ -148,15 +148,15 @@ parse_line (char *line, struct STRUCTURE *result,                       \
 
 #  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;
 
@@ -180,38 +180,35 @@ parse_list (char *line, struct parser_data *data, int datalen)
     {
       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.  */
-         __set_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 (isspace (*line));
-             elt = line;
-           }
-         else if (*line == '\0')
+         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;