projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
015cb34
..
ba5c548
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,12
+1,12
@@
/* getusershell.c -- Return names of valid user shells.
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991, 1997, 2000
, 2001, 2003, 200
4 Free Software
+ Copyright (C) 1991, 1997, 2000
-2001, 2003-2006, 2008-201
4 Free Software
Foundation, Inc.
Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,14
+14,14
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
/* 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>
+
+/* Specification. */
+#include <unistd.h>
#ifndef SHELLS_FILE
# ifndef __DJGPP__
#ifndef SHELLS_FILE
# ifndef __DJGPP__
@@
-33,24
+33,16
@@
# endif
#endif
# endif
#endif
-#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <stdlib.h>
#include <ctype.h>
+#include "stdio--.h"
#include "xalloc.h"
#if USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
#include "xalloc.h"
#if USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
-#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_ISASCII))
-# define IN_CTYPE_DOMAIN(c) 1
-#else
-# define IN_CTYPE_DOMAIN(c) isascii(c)
-#endif
-
-#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c))
-
static size_t readname (char **, size_t *, FILE *);
#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
static size_t readname (char **, size_t *, FILE *);
#if ! defined ADDITIONAL_DEFAULT_SHELLS && defined __MSDOS__
@@
-67,8
+59,8
@@
static char const* const default_shells[] =
"/bin/sh", "/bin/csh", "/usr/bin/sh", "/usr/bin/csh", NULL
};
"/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'. */
+/* 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 size_t default_index = 0;
/* Input stream from the shells file. */
@@
-77,7
+69,7
@@
static FILE *shellstream = NULL;
/* Line of input from the shells file. */
static char *line = NULL;
/* Line of input from the shells file. */
static char *line = NULL;
-/* Number of bytes allocated for
`
line'. */
+/* Number of bytes allocated for
'
line'. */
static size_t line_size = 0;
\f
/* Return an entry from the shells file, ignoring comment lines.
static size_t line_size = 0;
\f
/* Return an entry from the shells file, ignoring comment lines.
@@
-91,8
+83,8
@@
getusershell (void)
if (default_index > 0)
{
if (default_shells[default_index])
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;
}
return NULL;
}
@@
-100,19
+92,19
@@
getusershell (void)
{
shellstream = fopen (SHELLS_FILE, "r");
if (shellstream == NULL)
{
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 != '#')
}
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. */
}
/* Rewind the shells file. */
@@
-152,15
+144,15
@@
readname (char **name, size_t *size, FILE *stream)
size_t name_index = 0;
/* Skip blank space. */
size_t name_index = 0;
/* Skip blank space. */
- while ((c = getc (stream)) != EOF &&
ISSPACE
(c))
+ while ((c = getc (stream)) != EOF &&
isspace
(c))
/* Do nothing. */ ;
for (;;)
{
if (*size <= name_index)
/* Do nothing. */ ;
for (;;)
{
if (*size <= name_index)
- *name = x2nrealloc (*name, size, sizeof **name);
- if (c == EOF ||
ISSPACE
(c))
- break;
+
*name = x2nrealloc (*name, size, sizeof **name);
+ if (c == EOF ||
isspace
(c))
+
break;
(*name)[name_index++] = c;
c = getc (stream);
}
(*name)[name_index++] = c;
c = getc (stream);
}