Renamed from strtoxmax.c, removing the old strtoimax.c.

[gnulib.git] / lib / getusershell.c

diff --git a/lib/getusershell.c b/lib/getusershell.c
index 2f16718..4816f96 100644 (file)
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,5 +1,5 @@
 /* getusershell.c -- Return names of valid user shells.
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1997, 2000 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
@@ -22,27 +22,43 @@
 #endif
 
 #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>
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 #include <ctype.h>
+#include "xalloc.h"
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
 #else
-char *malloc ();
-char *realloc ();
+# define IN_CTYPE_DOMAIN(c) isascii(c)
 #endif
 
-char *xstrdup ();
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
 
 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
 };
 
@@ -100,10 +116,8 @@ void
 setusershell ()
 {
   default_index = 0;
-  if (shellstream == NULL)
-    shellstream = fopen (SHELLS_FILE, "r");
-  else
-    fseek (shellstream, 0L, 0);
+  if (shellstream)
+    rewind (shellstream);
 }
 
 /* Close the shells file. */
@@ -118,39 +132,6 @@ 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,
@@ -175,10 +156,10 @@ readname (name, size, stream)
     }
 
   /* Skip blank space.  */
-  while ((c = getc (stream)) != EOF && isspace (c))
+  while ((c = getc (stream)) != EOF && ISSPACE (c))
     /* Do nothing. */ ;
 
-  while (c != EOF && !isspace (c))
+  while (c != EOF && !ISSPACE (c))
     {
       (*name)[name_index++] = c;
       while (name_index >= *size)