X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=730d1b5c04bc19ba8d226d4a4aefc5c92feb3eea;hb=54c26afcfef8e232fbe34b601d7459bab899b2b5;hp=dfed7a6c41678e6d98149bec8c518437722cf52d;hpb=783c1624bd8b027a65b3fba57d3213ccb1a6ddbd;p=gnulib.git diff --git a/lib/getusershell.c b/lib/getusershell.c index dfed7a6c4..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 #include +#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 #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)