projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
4816f96
..
c026ec0
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,5
+1,5
@@
/* getusershell.c -- Return names of valid user shells.
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000
, 2001, 2003
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
@@
-32,10
+32,9
@@
#endif
#include <stdio.h>
#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 "xalloc.h"
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
#include "xalloc.h"
#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
@@
-46,7
+45,7
@@
#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
#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 \
@@
-64,7
+63,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;
@@
-73,7
+72,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).
@@
-81,7
+80,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)
{
@@
-113,7
+112,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)
@@
-123,7
+122,7
@@
setusershell ()
/* Close the shells file. */
void
/* Close the shells file. */
void
-endusershell ()
+endusershell (
void
)
{
if (shellstream)
{
{
if (shellstream)
{
@@
-137,22
+136,22
@@
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;
-
in
t name_index = 0;
+
size_
t name_index = 0;
if (*name == NULL)
{
if (*name == NULL)
{
- *size = 10;
- *name = (char *) xmalloc (*size);
+ /* The initial size must be a power of two, so that the overflow
+ check works. */
+ *size = 16;
+
+ *name = xmalloc (*size);
}
/* Skip blank space. */
}
/* Skip blank space. */
@@
-162,10
+161,12
@@
readname (name, size, stream)
while (c != EOF && !ISSPACE (c))
{
(*name)[name_index++] = c;
while (c != EOF && !ISSPACE (c))
{
(*name)[name_index++] = c;
-
while (name_index >= *size
)
+
if (*size < name_index
)
{
*size *= 2;
{
*size *= 2;
- *name = (char *) xrealloc (*name, *size);
+ if (! *size)
+ xalloc_die ();
+ *name = xrealloc (*name, *size);
}
c = getc (stream);
}
}
c = getc (stream);
}
@@
-174,7
+175,8
@@
readname (name, size, stream)
}
#ifdef TEST
}
#ifdef TEST
-main ()
+int
+main (void)
{
char *s;
{
char *s;