X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=f938dcaa3162dd5061815433379c318097ea7539;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=2f167181cf0a6fb9586da1d8911d1fd5d3c59f9e;hpb=ebbec4906457d05f702b6421761ddd09011beb5b;p=gnulib.git
diff --git a/lib/getusershell.c b/lib/getusershell.c
index 2f167181c..f938dcaa3 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,10 +1,12 @@
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2013 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,43 +14,54 @@
GNU General Public License for more details.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
+
+/* Specification. */
+#include
#ifndef SHELLS_FILE
+# ifndef __DJGPP__
/* File containing a list of nonrestricted shells, one per line. */
-# define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
+# else
+/* This is a horrible kludge. Isn't there a better way? */
+# define SHELLS_FILE "/dev/env/DJDIR/etc/shells"
+# endif
#endif
-#include
+#include
#include
-#ifdef STDC_HEADERS
-# include
-#else
-char *malloc ();
-char *realloc ();
+#include "stdio--.h"
+#include "xalloc.h"
+
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
#endif
-char *xstrdup ();
+static size_t readname (char **, size_t *, FILE *);
-static int readname ();
+#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
+# define ADDITIONAL_DEFAULT_SHELLS \
+ "c:/dos/command.com", "c:/windows/command.com", "c:/command.com",
+#else
+# define ADDITIONAL_DEFAULT_SHELLS /* empty */
+#endif
/* List of shells to use if the shells file is missing. */
static char const* const default_shells[] =
{
+ ADDITIONAL_DEFAULT_SHELLS
"/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
};
-/* Index of the next shell in `default_shells' to return.
- 0 means we are not using `default_shells'. */
-static int default_index = 0;
+/* Index of the next shell in 'default_shells' to return.
+ 0 means we are not using 'default_shells'. */
+static size_t default_index = 0;
/* Input stream from the shells file. */
static FILE *shellstream = NULL;
@@ -56,8 +69,8 @@ static FILE *shellstream = NULL;
/* Line of input from the shells file. */
static char *line = NULL;
-/* Number of bytes allocated for `line'. */
-static int line_size = 0;
+/* Number of bytes allocated for 'line'. */
+static size_t line_size = 0;
/* Return an entry from the shells file, ignoring comment lines.
If the file doesn't exist, use the list in DEFAULT_SHELLS (above).
@@ -65,13 +78,13 @@ static int line_size = 0;
Return NULL if there are no more entries. */
char *
-getusershell ()
+getusershell (void)
{
if (default_index > 0)
{
if (default_shells[default_index])
- /* Not at the end of the list yet. */
- return xstrdup (default_shells[default_index++]);
+ /* Not at the end of the list yet. */
+ return xstrdup (default_shells[default_index++]);
return NULL;
}
@@ -79,37 +92,35 @@ getusershell ()
{
shellstream = fopen (SHELLS_FILE, "r");
if (shellstream == NULL)
- {
- /* No shells file. Use the default list. */
- default_index = 1;
- return xstrdup (default_shells[0]);
- }
+ {
+ /* No shells file. Use the default list. */
+ default_index = 1;
+ return xstrdup (default_shells[0]);
+ }
}
while (readname (&line, &line_size, shellstream))
{
if (*line != '#')
- return line;
+ return line;
}
- return NULL; /* End of file. */
+ return NULL; /* End of file. */
}
/* Rewind the shells file. */
void
-setusershell ()
+setusershell (void)
{
default_index = 0;
- if (shellstream == NULL)
- shellstream = fopen (SHELLS_FILE, "r");
- else
- fseek (shellstream, 0L, 0);
+ if (shellstream)
+ rewind (shellstream);
}
/* Close the shells file. */
void
-endusershell ()
+endusershell (void)
{
if (shellstream)
{
@@ -118,74 +129,31 @@ endusershell ()
}
}
-/* Allocate N bytes of memory dynamically, with error checking. */
-
-static char *
-xmalloc (n)
- unsigned n;
-{
- char *p;
-
- p = malloc (n);
- if (p == 0)
- {
- fprintf (stderr, "virtual memory exhausted\n");
- exit (1);
- }
- return p;
-}
-
-/* Reallocate space P to size N, with error checking. */
-
-static char *
-xrealloc (p, n)
- char *p;
- unsigned n;
-{
- p = realloc (p, n);
- if (p == 0)
- {
- fprintf (stderr, "virtual memory exhausted\n");
- exit (1);
- }
- return p;
-}
-
/* Read a line from STREAM, removing any newline at the end.
Place the result in *NAME, which is malloc'd
and/or realloc'd as necessary and can start out NULL,
and whose size is passed and returned in *SIZE.
- Return the number of characters placed in *NAME
+ Return the number of bytes placed in *NAME
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 name_index = 0;
-
- if (*name == NULL)
- {
- *size = 10;
- *name = (char *) xmalloc (*size);
- }
+ size_t name_index = 0;
/* Skip blank space. */
while ((c = getc (stream)) != EOF && isspace (c))
/* 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;
- while (name_index >= *size)
- {
- *size *= 2;
- *name = (char *) xrealloc (*name, *size);
- }
c = getc (stream);
}
(*name)[name_index] = '\0';
@@ -193,7 +161,8 @@ readname (name, size, stream)
}
#ifdef TEST
-main ()
+int
+main (void)
{
char *s;