diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:05 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-09 16:59:05 +0000 |
| commit | cb052e4f6cc723bc408f32963e921705f3286c94 (patch) | |
| tree | d6f6172f7cff8f5c44f9ae557a525e4b1baf277b /lib/getusershell.c | |
| parent | 28edf6a75ef4f95e18da5b506bdcf122a53ca3ec (diff) | |
| download | coreutils-cb052e4f6cc723bc408f32963e921705f3286c94.tar.xz | |
Update from gnulib.
Diffstat (limited to 'lib/getusershell.c')
| -rw-r--r-- | lib/getusershell.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/lib/getusershell.c b/lib/getusershell.c index ec35aa241..a75d4fd48 100644 --- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -1,7 +1,7 @@ /* getusershell.c -- Return names of valid user shells. - Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005 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 @@ -43,14 +43,6 @@ # include "unlocked-io.h" #endif -#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)) - static size_t readname (char **, size_t *, FILE *); #if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__ @@ -152,14 +144,14 @@ readname (char **name, size_t *size, FILE *stream) size_t name_index = 0; /* Skip blank space. */ - while ((c = getc (stream)) != EOF && ISSPACE (c)) + while ((c = getc (stream)) != EOF && isspace (c)) /* Do nothing. */ ; for (;;) { if (*size <= name_index) *name = x2nrealloc (*name, size, sizeof **name); - if (c == EOF || ISSPACE (c)) + if (c == EOF || isspace (c)) break; (*name)[name_index++] = c; c = getc (stream); |