*** empty log message ***

[gnulib.git] / lib / getusershell.c

diff --git a/lib/getusershell.c b/lib/getusershell.c
index f11bde6..730d1b5 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 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
@@ -18,19 +18,27 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
 #endif
 
 #ifndef SHELLS_FILE
 /* File containing a list of nonrestricted shells, one per line. */
-#define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
 #endif
 
 #include <stdio.h>
 #include <ctype.h>
 
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
+#else
+# define IN_CTYPE_DOMAIN(c) isascii(c)
+#endif
+
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
+
 #ifdef STDC_HEADERS
-#include <stdlib.h>
+# include <stdlib.h>
 #else
 char *malloc ();
 char *realloc ();
@@ -175,10 +183,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)