Loading...
--- Libc/Libc-1725.40.4/gen/getusershell.c
+++ Libc/Libc-391.4.3/gen/getusershell.c
@@ -69,7 +69,7 @@
* /etc/shells.
*/
-static const char * const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
+static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
static char **curshell, **shells, *strings;
static char **initshells(void);
@@ -77,7 +77,7 @@
* Get a list of shells from _PATH_SHELLS, if it exists.
*/
char *
-getusershell(void)
+getusershell()
{
char *ret;
@@ -90,8 +90,9 @@
}
void
-endusershell(void)
+endusershell()
{
+
if (shells != NULL)
free(shells);
shells = NULL;
@@ -102,13 +103,14 @@
}
void
-setusershell(void)
+setusershell()
{
+
curshell = initshells();
}
static char **
-initshells(void)
+initshells()
{
register char **sp, *cp;
register FILE *fp;
@@ -122,21 +124,21 @@
free(strings);
strings = NULL;
if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
- return ((char **)okshells);
+ return (okshells);
if (fstat(fileno(fp), &statb) == -1) {
(void)fclose(fp);
- return ((char **)okshells);
+ return (okshells);
}
if ((strings = malloc((u_int)statb.st_size)) == NULL) {
(void)fclose(fp);
- return ((char **)okshells);
+ return (okshells);
}
shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));
if (shells == NULL) {
(void)fclose(fp);
free(strings);
strings = NULL;
- return ((char **)okshells);
+ return (okshells);
}
sp = shells;
cp = strings;