projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint.mk: avoid sc_prohibit_always-defined_macros failure in coreutils
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
6e7a443
..
3ac7c8d
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, 2004, 2005, 2006 Fre
e
-
Software
Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000
-2001, 2003-2006, 2008-2011 Free Softwar
e
+ 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,13
+14,15
@@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
#include <config.h>
/* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
#include <config.h>
+/* Specification. */
+#include <unistd.h>
+
#ifndef SHELLS_FILE
# ifndef __DJGPP__
/* File containing a list of nonrestricted shells, one per line. */
#ifndef SHELLS_FILE
# ifndef __DJGPP__
/* File containing a list of nonrestricted shells, one per line. */
@@
-81,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;
}
@@
-90,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. */
@@
-148,9
+150,9
@@
readname (char **name, size_t *size, FILE *stream)
for (;;)
{
if (*size <= name_index)
for (;;)
{
if (*size <= name_index)
- *name = x2nrealloc (*name, size, sizeof **name);
+
*name = x2nrealloc (*name, size, sizeof **name);
if (c == EOF || isspace (c))
if (c == EOF || isspace (c))
- break;
+
break;
(*name)[name_index++] = c;
c = getc (stream);
}
(*name)[name_index++] = c;
c = getc (stream);
}