X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=6e7a443f12f26cfcea7d3173db0e9ba453c383ba;hb=2e7980e7a83a290bfaf0638bd95a9cbfeec0f67d;hp=2607535f23ba39e98ac0a9b9e1d1283ee75e9fe0;hpb=10074829b405d5ada97315d30d400e6dd42d48ae;p=gnulib.git diff --git a/lib/getusershell.c b/lib/getusershell.c index 2607535f2..6e7a443f1 100644 --- a/lib/getusershell.c +++ b/lib/getusershell.c @@ -1,5 +1,7 @@ /* getusershell.c -- Return names of valid user shells. - Copyright (C) 1991 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 @@ -12,48 +14,52 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* Written by David MacKenzie */ -#ifdef HAVE_CONFIG_H -#if defined (CONFIG_BROKETS) -/* We use instead of "config.h" so that a compilation - using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h - (which it would do because it found this file in $srcdir). */ #include -#else -#include "config.h" -#endif -#endif #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 -static int readname (); +static size_t readname (char **, size_t *, FILE *); + +#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; +static size_t default_index = 0; /* Input stream from the shells file. */ static FILE *shellstream = NULL; @@ -62,19 +68,21 @@ static FILE *shellstream = NULL; static char *line = NULL; /* Number of bytes allocated for `line'. */ -static int line_size = 0; +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). + In any case, the returned string is in memory allocated through malloc. 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 default_shells[default_index++]; + return xstrdup (default_shells[default_index++]); return NULL; } @@ -85,7 +93,7 @@ getusershell () { /* No shells file. Use the default list. */ default_index = 1; - return default_shells[0]; + return xstrdup (default_shells[0]); } } @@ -100,19 +108,17 @@ getusershell () /* 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) { @@ -121,74 +127,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'; @@ -196,7 +159,8 @@ readname (name, size, stream) } #ifdef TEST -main () +int +main (void) { char *s;