X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetusershell.c;h=a97b34ab89846a80bcfcc7201e4c589b901d629f;hb=f4c549fab688ce822556eadcf60fdda5042ade11;hp=a75d4fd4862d1f7b3077877058a9ec4a95f5f70d;hpb=4fde4952d5a3db51a122f96a31bfcd6879399fea;p=gnulib.git
diff --git a/lib/getusershell.c b/lib/getusershell.c
index a75d4fd48..a97b34ab8 100644
--- a/lib/getusershell.c
+++ b/lib/getusershell.c
@@ -1,12 +1,12 @@
/* getusershell.c -- Return names of valid user shells.
- Copyright (C) 1991, 1997, 2000, 2001, 2003, 2004, 2005, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1991, 1997, 2000-2001, 2003-2006, 2008-2010 Free Software
+ 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
- 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
@@ -14,14 +14,14 @@
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 . */
/* Written by David MacKenzie */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
+
+/* Specification. */
+#include
#ifndef SHELLS_FILE
# ifndef __DJGPP__
@@ -83,8 +83,8 @@ 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;
}
@@ -92,19 +92,19 @@ getusershell (void)
{
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. */
@@ -150,9 +150,9 @@ readname (char **name, size_t *size, FILE *stream)
for (;;)
{
if (*size <= name_index)
- *name = x2nrealloc (*name, size, sizeof **name);
+ *name = x2nrealloc (*name, size, sizeof **name);
if (c == EOF || isspace (c))
- break;
+ break;
(*name)[name_index++] = c;
c = getc (stream);
}