BSD 4_3_Net_2 release

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

diff --git a/usr/src/lib/libc/gen/scandir.c b/usr/src/lib/libc/gen/scandir.c
index 53c1b03..6c4116c 100644 (file)
--- a/usr/src/lib/libc/gen/scandir.c
+++ b/usr/src/lib/libc/gen/scandir.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 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[] = "@(#)scandir.c  5.9 (Berkeley) 6/24/90";
+static char sccsid[] = "@(#)scandir.c  5.10 (Berkeley) 2/23/91";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -31,6 +45,8 @@ static char sccsid[] = "@(#)scandir.c 5.9 (Berkeley) 6/24/90";
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>

+#include <stdlib.h>
+#include <string.h>

 
 /*
  * The DIRSIZ macro gives the minimum record length which will hold
 
 /*
  * The DIRSIZ macro gives the minimum record length which will hold


@@ -42,13 +58,15 @@ static char sccsid[] = "@(#)scandir.c       5.9 (Berkeley) 6/24/90";
 #define DIRSIZ(dp) \
     ((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 
 #define DIRSIZ(dp) \
     ((sizeof (struct dirent) - (MAXNAMLEN+1)) + (((dp)->d_namlen+1 + 3) &~ 3))
 

+int

 scandir(dirname, namelist, select, dcomp)
 scandir(dirname, namelist, select, dcomp)

-       char *dirname;
+       const char *dirname;

        struct dirent ***namelist;
        struct dirent ***namelist;

-       int (*select)(), (*dcomp)();
+       int (*select) __P((struct dirent *));
+       int (*dcomp) __P((const void *, const void *));

 {
        register struct dirent *d, *p, **names;
 {
        register struct dirent *d, *p, **names;

-       register int nitems;
+       register size_t nitems;

        struct stat stb;
        long arraysz;
        DIR *dirp;
        struct stat stb;
        long arraysz;
        DIR *dirp;


@@ -106,8 +124,10 @@ scandir(dirname, namelist, select, dcomp)
 /*
  * Alphabetic order comparison routine for those who want it.
  */
 /*
  * Alphabetic order comparison routine for those who want it.
  */

+int

 alphasort(d1, d2)
 alphasort(d1, d2)

-       void *d1, *d2;
+       const void *d1;
+       const void *d2;

 {
        return(strcmp((*(struct dirent **)d1)->d_name,
            (*(struct dirent **)d2)->d_name));
 {
        return(strcmp((*(struct dirent **)d1)->d_name,
            (*(struct dirent **)d2)->d_name));