/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991 Free Software Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000 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
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
#ifdef HAVE_CONFIG_H
-#include <config.h>
+# include <config.h>
#endif
#ifndef SHELLS_FILE
/* File containing a list of nonrestricted shells, one per line. */
-#define SHELLS_FILE "/etc/shells"
+# define SHELLS_FILE "/etc/shells"
#endif
#include <stdio.h>
#include <ctype.h>
+#include "xalloc.h"
-#ifdef STDC_HEADERS
-#include <stdlib.h>
+#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
+# define IN_CTYPE_DOMAIN(c) 1
#else
-char *malloc ();
-char *realloc ();
+# define IN_CTYPE_DOMAIN(c) isascii(c)
#endif
-char *xstrdup ();
+#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
static int readname ();
}
}
-/* 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,
}
/* Skip blank space. */
- while ((c = getc (stream)) != EOF && isspace (c))
+ while ((c = getc (stream)) != EOF && ISSPACE (c))
/* Do nothing. */ ;
-
- while (c != EOF && !isspace (c))
+
+ while (c != EOF && !ISSPACE (c))
{
(*name)[name_index++] = c;
while (name_index >= *size)