BSD 4_4 release

[unix-history] / usr / src / lib / libc / gen / getusershell.c

diff --git a/usr/src/lib/libc/gen/getusershell.c b/usr/src/lib/libc/gen/getusershell.c
index b13e3b5..2bcdaf7 100644 (file)
--- a/usr/src/lib/libc/gen/getusershell.c
+++ b/usr/src/lib/libc/gen/getusershell.c
@@ -1,46 +1,60 @@
 /*
 /*

- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1985, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)getusershell.c     5.6 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)getusershell.c     8.1 (Berkeley) 6/4/93";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/stat.h>

-#include <ctype.h>

 #include <stdio.h>
 #include <stdio.h>

-
-#define SHELLS "/etc/shells"
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <paths.h>

 
 /*
 
 /*

- * Do not add local shells here.  They should be added in /etc/shells
+ * Local shells should NOT be added here.  They should be added in
+ * /etc/shells.

  */
  */

-static char *okshells[] =
-    { "/bin/sh", "/bin/csh", 0 };

 
 

-static char **shells, *strings;
-static char **curshell = NULL;
-extern char **initshells();
+static char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
+static char **curshell, **shells, *strings;
+static char **initshells __P((void));

 
 /*
 
 /*

- * Get a list of shells from SHELLS, if it exists.
+ * Get a list of shells from _PATH_SHELLS, if it exists.

  */
 char *
 getusershell()
  */
 char *
 getusershell()


@@ -55,11 +69,12 @@ getusershell()
        return (ret);
 }
 
        return (ret);
 }
 

+void

 endusershell()
 {
        
        if (shells != NULL)
 endusershell()
 {
        
        if (shells != NULL)

-               free((char *)shells);
+               free(shells);

        shells = NULL;
        if (strings != NULL)
                free(strings);
        shells = NULL;
        if (strings != NULL)
                free(strings);


@@ -67,6 +82,7 @@ endusershell()
        curshell = NULL;
 }
 
        curshell = NULL;
 }
 

+void

 setusershell()
 {
 
 setusershell()
 {
 


@@ -79,30 +95,29 @@ initshells()
        register char **sp, *cp;
        register FILE *fp;
        struct stat statb;
        register char **sp, *cp;
        register FILE *fp;
        struct stat statb;

-       extern char *malloc(), *calloc();

 
        if (shells != NULL)
 
        if (shells != NULL)

-               free((char *)shells);
+               free(shells);

        shells = NULL;
        if (strings != NULL)
                free(strings);
        strings = NULL;
        shells = NULL;
        if (strings != NULL)
                free(strings);
        strings = NULL;

-       if ((fp = fopen(SHELLS, "r")) == (FILE *)0)
-               return(okshells);
+       if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
+               return (okshells);

        if (fstat(fileno(fp), &statb) == -1) {
                (void)fclose(fp);
        if (fstat(fileno(fp), &statb) == -1) {
                (void)fclose(fp);

-               return(okshells);
+               return (okshells);

        }
        }

-       if ((strings = malloc((unsigned)statb.st_size)) == NULL) {
+       if ((strings = malloc((u_int)statb.st_size)) == NULL) {

                (void)fclose(fp);
                (void)fclose(fp);

-               return(okshells);
+               return (okshells);

        }
        }

-       shells = (char **)calloc((unsigned)statb.st_size / 3, sizeof (char *));
+       shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));

        if (shells == NULL) {
                (void)fclose(fp);
                free(strings);
                strings = NULL;
        if (shells == NULL) {
                (void)fclose(fp);
                free(strings);
                strings = NULL;

-               return(okshells);
+               return (okshells);

        }
        sp = shells;
        cp = strings;
        }
        sp = shells;
        cp = strings;


@@ -116,7 +131,7 @@ initshells()
                        cp++;
                *cp++ = '\0';
        }
                        cp++;
                *cp++ = '\0';
        }

-       *sp = (char *)0;
+       *sp = NULL;

        (void)fclose(fp);
        return (shells);
 }
        (void)fclose(fp);
        return (shells);
 }