1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
This commit is contained in:
Jakub Jelinek
2007-07-12 18:26:36 +00:00
parent 7d58530341
commit 0ecb606cb6
6215 changed files with 494638 additions and 305010 deletions

View File

@ -46,7 +46,15 @@ static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93";
* /etc/shells.
*/
static const char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
/* NB: we do not initialize okshells here. The initialization needs
relocations. These interfaces are used so rarely that this is not
justified. Instead explicitly initialize the array when it is
used. */
#if 0
static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
#else
static const char *okshells[3];
#endif
static char **curshell, **shells, *strings;
static char **initshells (void) __THROW;
@ -70,11 +78,9 @@ void
endusershell()
{
if (shells != NULL)
free(shells);
free(shells);
shells = NULL;
if (strings != NULL)
free(strings);
free(strings);
strings = NULL;
curshell = NULL;
}
@ -92,40 +98,39 @@ initshells()
register char **sp, *cp;
register FILE *fp;
struct stat64 statb;
int flen;
size_t flen;
if (shells != NULL)
free(shells);
free(shells);
shells = NULL;
if (strings != NULL)
free(strings);
free(strings);
strings = NULL;
if ((fp = fopen(_PATH_SHELLS, "rc")) == NULL)
return (char **) okshells;
goto init_okshells_noclose;
if (fstat64(fileno(fp), &statb) == -1) {
init_okshells:
(void)fclose(fp);
init_okshells_noclose:
okshells[0] = _PATH_BSHELL;
okshells[1] = _PATH_CSHELL;
return (char **) okshells;
}
if ((strings = malloc((u_int)statb.st_size + 1)) == NULL) {
(void)fclose(fp);
return (char **) okshells;
}
shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));
if (statb.st_size > ~(size_t)0 / sizeof (char *) * 3)
goto init_okshells;
if ((strings = malloc(statb.st_size + 2)) == NULL)
goto init_okshells;
shells = malloc(statb.st_size / 3 * sizeof (char *));
if (shells == NULL) {
(void)fclose(fp);
free(strings);
strings = NULL;
return (char **) okshells;
goto init_okshells;
}
/* No threads using this stream. */
__fsetlocking (fp, FSETLOCKING_BYCALLER);
sp = shells;
cp = strings;
flen = statb.st_size;
flen = statb.st_size + 2;
while (fgets_unlocked(cp, flen - (cp - strings), fp) != NULL) {
while (*cp != '#' && *cp != '/' && *cp != '\0')
cp++;
if (*cp == '#' || *cp == '\0')
if (*cp == '#' || *cp == '\0' || cp[1] == '\0')
continue;
*sp++ = cp;
while (!isspace(*cp) && *cp != '#' && *cp != '\0')