projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
float tests: Correct and re-enable assertion about LDBL_MIN_EXP.
[gnulib.git]
/
lib
/
getusershell.c
diff --git
a/lib/getusershell.c
b/lib/getusershell.c
index
bea62a0
..
3ac7c8d
100644
(file)
--- a/
lib/getusershell.c
+++ b/
lib/getusershell.c
@@
-1,7
+1,7
@@
/* 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, 2008 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
it under the terms of the GNU General Public License as published by
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
@@
-83,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;
}
@@
-92,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. */
@@
-150,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);
}