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

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 1025fbd59..9b60f18d5 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -45,7 +45,7 @@
 
 #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 \
@@ -63,7 +63,7 @@ static char const* const default_shells[] =
 
 /* Index of the next shell in `default_shells' to return.
    0 means we are not using `default_shells'. */
-static int default_index = 0;
+static size_t default_index = 0;
 
 /* Input stream from the shells file. */
 static FILE *shellstream = NULL;
@@ -72,7 +72,7 @@ static FILE *shellstream = NULL;
 static char *line = NULL;
 
 /* Number of bytes allocated for `line'. */
-static int line_size = 0;
+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).
@@ -136,33 +136,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))
     /* 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';