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
3401c88
..
6e7a443
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,5
+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 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
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
@@
-13,13
+15,11
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* 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__
@@
-31,23
+31,17
@@
# endif
#endif
# endif
#endif
-#include <stdio.h>
-#if HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include <stdlib.h>
#include <ctype.h>
#include <ctype.h>
-#include "unlocked-io.h"
+
+#include "stdio--.h"
#include "xalloc.h"
#include "xalloc.h"
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
#endif
#endif
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
-
-static int readname ();
+static size_t readname (char **, size_t *, FILE *);
#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
# define ADDITIONAL_DEFAULT_SHELLS \
#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
# define ADDITIONAL_DEFAULT_SHELLS \
@@
-65,7
+59,7
@@
static char const* const default_shells[] =
/* Index of the next shell in `default_shells' to return.
0 means we are not using `default_shells'. */
/* Index of the next shell in `default_shells' to return.
0 means we are not using `default_shells'. */
-static
in
t default_index = 0;
+static
size_
t default_index = 0;
/* Input stream from the shells file. */
static FILE *shellstream = NULL;
/* Input stream from the shells file. */
static FILE *shellstream = NULL;
@@
-74,7
+68,7
@@
static FILE *shellstream = NULL;
static char *line = NULL;
/* Number of bytes allocated for `line'. */
static char *line = NULL;
/* Number of bytes allocated for `line'. */
-static
in
t line_size = 0;
+static
size_
t line_size = 0;
\f
/* Return an entry from the shells file, ignoring comment lines.
If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
\f
/* Return an entry from the shells file, ignoring comment lines.
If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
@@
-82,7
+76,7
@@
static int line_size = 0;
Return NULL if there are no more entries. */
char *
Return NULL if there are no more entries. */
char *
-getusershell ()
+getusershell (
void
)
{
if (default_index > 0)
{
{
if (default_index > 0)
{
@@
-114,7
+108,7
@@
getusershell ()
/* Rewind the shells file. */
void
/* Rewind the shells file. */
void
-setusershell ()
+setusershell (
void
)
{
default_index = 0;
if (shellstream)
{
default_index = 0;
if (shellstream)
@@
-124,7
+118,7
@@
setusershell ()
/* Close the shells file. */
void
/* Close the shells file. */
void
-endusershell ()
+endusershell (
void
)
{
if (shellstream)
{
{
if (shellstream)
{
@@
-138,36
+132,26
@@
endusershell ()
and/or realloc'd as necessary and can start out NULL,
and whose size is passed and returned in *SIZE.
and/or realloc'd as necessary and can start out NULL,
and whose size is passed and returned in *SIZE.
- Return the number of
character
s placed in *NAME
+ Return the number of
byte
s placed in *NAME
if some nonempty sequence was found, otherwise 0. */
if some nonempty sequence was found, otherwise 0. */
-static int
-readname (name, size, stream)
- char **name;
- int *size;
- FILE *stream;
+static size_t
+readname (char **name, size_t *size, FILE *stream)
{
int c;
{
int c;
- int name_index = 0;
-
- if (*name == NULL)
- {
- *size = 10;
- *name = xmalloc (*size);
- }
+ size_t name_index = 0;
/* Skip blank space. */
/* Skip blank space. */
- while ((c = getc (stream)) != EOF &&
ISSPACE
(c))
+ while ((c = getc (stream)) != EOF &&
isspace
(c))
/* Do nothing. */ ;
/* Do nothing. */ ;
-
while (c != EOF && !ISSPACE (c)
)
+
for (;;
)
{
{
+ if (*size <= name_index)
+ *name = x2nrealloc (*name, size, sizeof **name);
+ if (c == EOF || isspace (c))
+ break;
(*name)[name_index++] = c;
(*name)[name_index++] = c;
- while (name_index >= *size)
- {
- *size *= 2;
- *name = xrealloc (*name, *size);
- }
c = getc (stream);
}
(*name)[name_index] = '\0';
c = getc (stream);
}
(*name)[name_index] = '\0';
@@
-175,7
+159,8
@@
readname (name, size, stream)
}
#ifdef TEST
}
#ifdef TEST
-main ()
+int
+main (void)
{
char *s;
{
char *s;