X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=ba5c548430db3ca38a7330b4bf192801c41c6963;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=1025fbd592ecf6ec9c12a744d751ae6d4d3cc66c;hpb=0a7a9905bf6051f5fb6cca69a85720f83424dd90;p=gnulib.git

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 1025fbd59..ba5c54843 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,10 +1,12 @@
 /* getusershell.c -- Return names of valid user shells.
-   Copyright (C) 1991, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2014 Free Software
+   Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +14,14 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+/* Specification.  */
+#include <unistd.h>
 
 #ifndef SHELLS_FILE
 # ifndef __DJGPP__
@@ -31,21 +33,17 @@
 # endif
 #endif
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "unlocked-io.h"
+
+#include "stdio--.h"
 #include "xalloc.h"
 
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
 #endif
 
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
-
-static int readname (char **, int *, FILE *);
+static size_t readname (char **, size_t *, FILE *);
 
 #if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
 # define ADDITIONAL_DEFAULT_SHELLS \
@@ -61,9 +59,9 @@ static char const* const default_shells[] =
   "/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
 };
 
-/* Index of the next shell in `default_shells' to return.
-   0 means we are not using `default_shells'. */
-static int default_index = 0;
+/* Index of the next shell in 'default_shells' to return.
+   0 means we are not using 'default_shells'. */
+static size_t default_index = 0;
 
 /* Input stream from the shells file. */
 static FILE *shellstream = NULL;
@@ -71,8 +69,8 @@ static FILE *shellstream = NULL;
 /* Line of input from the shells file. */
 static char *line = NULL;
 
-/* Number of bytes allocated for `line'. */
-static int line_size = 0;
+/* Number of bytes allocated for 'line'. */
+static size_t line_size = 0;
 
 /* Return an entry from the shells file, ignoring comment lines.
    If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
@@ -85,8 +83,8 @@ getusershell (void)
   if (default_index > 0)
     {
       if (default_shells[default_index])
-	/* Not at the end of the list yet.  */
-	return xstrdup (default_shells[default_index++]);
+        /* Not at the end of the list yet.  */
+        return xstrdup (default_shells[default_index++]);
       return NULL;
     }
 
@@ -94,19 +92,19 @@ getusershell (void)
     {
       shellstream = fopen (SHELLS_FILE, "r");
       if (shellstream == NULL)
-	{
-	  /* No shells file.  Use the default list.  */
-	  default_index = 1;
-	  return xstrdup (default_shells[0]);
-	}
+        {
+          /* No shells file.  Use the default list.  */
+          default_index = 1;
+          return xstrdup (default_shells[0]);
+        }
     }
 
   while (readname (&line, &line_size, shellstream))
     {
       if (*line != '#')
-	return line;
+        return line;
     }
-  return NULL;			/* End of file. */
+  return NULL;                  /* End of file. */
 }
 
 /* Rewind the shells file. */
@@ -136,33 +134,26 @@ endusershell (void)
    and/or realloc'd as necessary and can start out NULL,
    and whose size is passed and returned in *SIZE.
 
-   Return the number of characters placed in *NAME
+   Return the number of bytes placed in *NAME
    if some nonempty sequence was found, otherwise 0.  */
 
-static int
-readname (char **name, int *size, FILE *stream)
+static size_t
+readname (char **name, size_t *size, FILE *stream)
 {
   int c;
-  int name_index = 0;
-
-  if (*name == NULL)
-    {
-      *size = 10;
-      *name = xmalloc (*size);
-    }
+  size_t name_index = 0;
 
   /* Skip blank space.  */
-  while ((c = getc (stream)) != EOF && ISSPACE (c))
+  while ((c = getc (stream)) != EOF && isspace (c))
     /* Do nothing. */ ;
 
-  while (c != EOF && !ISSPACE (c))
+  for (;;)
     {
+      if (*size <= name_index)
+        *name = x2nrealloc (*name, size, sizeof **name);
+      if (c == EOF || isspace (c))
+        break;
       (*name)[name_index++] = c;
-      while (name_index >= *size)
-	{
-	  *size *= 2;
-	  *name = xrealloc (*name, *size);
-	}
       c = getc (stream);
     }
   (*name)[name_index] = '\0';