projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
1b9a18a
..
6e7a443
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,7
+1,7
@@
/* getusershell.c -- Return names of valid user shells.
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005
, 2006 Fre
e
+
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
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
@@
-19,9
+19,7
@@
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#ifndef SHELLS_FILE
# ifndef __DJGPP__
#ifndef SHELLS_FILE
# ifndef __DJGPP__
@@
-33,25
+31,16
@@
# endif
#endif
# endif
#endif
-#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
-#include "stdio-
safer
.h"
+#include "stdio-
-
.h"
#include "xalloc.h"
#if USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
#include "xalloc.h"
#if USE_UNLOCKED_IO
# 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__
static size_t readname (char **, size_t *, FILE *);
#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
@@
-99,7
+88,7
@@
getusershell (void)
if (shellstream == NULL)
{
if (shellstream == NULL)
{
- shellstream = fopen
_safer
(SHELLS_FILE, "r");
+ shellstream = fopen (SHELLS_FILE, "r");
if (shellstream == NULL)
{
/* No shells file. Use the default list. */
if (shellstream == NULL)
{
/* No shells file. Use the default list. */
@@
-153,14
+142,14
@@
readname (char **name, size_t *size, FILE *stream)
size_t name_index = 0;
/* Skip blank space. */
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);
/* 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);
break;
(*name)[name_index++] = c;
c = getc (stream);