X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=6e7a443f12f26cfcea7d3173db0e9ba453c383ba;hb=2e7980e7a83a290bfaf0638bd95a9cbfeec0f67d;hp=dfed7a6c41678e6d98149bec8c518437722cf52d;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git

diff --git a/lib/getusershell.c b/lib/getusershell.c
index dfed7a6c4..6e7a443f1 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,5 +1,7 @@
 /* getusershell.c -- Return names of valid user shells.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+
+   Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005, 2006 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
@@ -13,42 +15,51 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #ifndef SHELLS_FILE
+# ifndef __DJGPP__
 /* File containing a list of nonrestricted shells, one per line. */
-# define SHELLS_FILE "/etc/shells"
+#  define SHELLS_FILE "/etc/shells"
+# else
+/* This is a horrible kludge.  Isn't there a better way?  */
+#  define SHELLS_FILE "/dev/env/DJDIR/etc/shells"
+# endif
 #endif
 
-#include <stdio.h>
+#include <stdlib.h>
 #include <ctype.h>
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc ();
-char *realloc ();
+#include "stdio--.h"
+#include "xalloc.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
 #endif
 
-char *xstrdup ();
+static size_t readname (char **, size_t *, FILE *);
 
-static int readname ();
+#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
+# define ADDITIONAL_DEFAULT_SHELLS \
+  "c:/dos/command.com", "c:/windows/command.com", "c:/command.com",
+#else
+# define ADDITIONAL_DEFAULT_SHELLS /* empty */
+#endif
 
 /* List of shells to use if the shells file is missing. */
 static char const* const default_shells[] =
 {
+  ADDITIONAL_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;
+static size_t default_index = 0;
 
 /* Input stream from the shells file. */
 static FILE *shellstream = NULL;
@@ -57,7 +68,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).
@@ -65,7 +76,7 @@ static int line_size = 0;
    Return NULL if there are no more entries.  */
 
 char *
-getusershell ()
+getusershell (void)
 {
   if (default_index > 0)
     {
@@ -97,19 +108,17 @@ getusershell ()
 /* Rewind the shells file. */
 
 void
-setusershell ()
+setusershell (void)
 {
   default_index = 0;
-  if (shellstream == NULL)
-    shellstream = fopen (SHELLS_FILE, "r");
-  else
-    fseek (shellstream, 0L, 0);
+  if (shellstream)
+    rewind (shellstream);
 }
 
 /* Close the shells file. */
 
 void
-endusershell ()
+endusershell (void)
 {
   if (shellstream)
     {
@@ -118,74 +127,31 @@ endusershell ()
     }
 }
 
-/* Allocate N bytes of memory dynamically, with error checking.  */
-
-static char *
-xmalloc (n)
-     unsigned n;
-{
-  char *p;
-
-  p = malloc (n);
-  if (p == 0)
-    {
-      fprintf (stderr, "virtual memory exhausted\n");
-      exit (1);
-    }
-  return p;
-}
-
-/* Reallocate space P to size N, with error checking.  */
-
-static char *
-xrealloc (p, n)
-     char *p;
-     unsigned n;
-{
-  p = realloc (p, n);
-  if (p == 0)
-    {
-      fprintf (stderr, "virtual memory exhausted\n");
-      exit (1);
-    }
-  return p;
-}
-
 /* Read a line from STREAM, removing any newline at the end.
    Place the result in *NAME, which is malloc'd
    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 (name, size, stream)
-     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 = (char *) 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 = (char *) xrealloc (*name, *size);
-	}
       c = getc (stream);
     }
   (*name)[name_index] = '\0';
@@ -193,7 +159,8 @@ readname (name, size, stream)
 }
 
 #ifdef TEST
-main ()
+int
+main (void)
 {
   char *s;