summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1997-09-21 13:15:48 +0000
committerJim Meyering <jim@meyering.net>1997-09-21 13:15:48 +0000
commit99e8d1ac517788be58405d91e95d4d1ce21c76d3 (patch)
treea5f0157017b315e1e24e8a4ec22c7a0de9d880da /lib
parent0ea3fb3c07bb72c81470bc4c0a90d66e4857fa31 (diff)
downloadcoreutils-99e8d1ac517788be58405d91e95d4d1ce21c76d3.tar.xz
(IN_CTYPE_DOMAIN): Define.
(ISSPACE): Define. (readname): Use ISSPACE, not isspace.
Diffstat (limited to 'lib')
-rw-r--r--lib/getusershell.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/getusershell.c b/lib/getusershell.c
index 2f167181c..730d1b5c0 100644
--- 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
@@ -29,6 +29,14 @@
#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>
#else
@@ -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)