BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.bin / find / ls.c

diff --git a/usr/src/usr.bin/find/ls.c b/usr/src/usr.bin/find/ls.c
index df32d80..a404f1b 100644 (file)
--- a/usr/src/usr.bin/find/ls.c
+++ b/usr/src/usr.bin/find/ls.c
@@ -2,48 +2,61 @@
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not 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.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)ls.c       5.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)ls.c       5.6 (Berkeley) 3/9/91";

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

+#include <time.h>

 #include <tzfile.h>
 #include <tzfile.h>

+#include <errno.h>

 #include <utmp.h>
 #include <utmp.h>

+#include <unistd.h>

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

+#include <string.h>

 
 /* Derived from the print routines in the ls(1) source code. */
 
 
 /* Derived from the print routines in the ls(1) source code. */
 

-extern int errno;
-

 void
 printlong(name, accpath, sb)
        char *name;                     /* filename to print */
        char *accpath;                  /* current valid path to filename */
        struct stat *sb;                /* stat buffer */
 {
 void
 printlong(name, accpath, sb)
        char *name;                     /* filename to print */
        char *accpath;                  /* current valid path to filename */
        struct stat *sb;                /* stat buffer */
 {

-       extern int errno;
-       static char *modep;
-       char *user_from_uid(), *group_from_gid(), *strerror();
+       char modep[15], *user_from_uid(), *group_from_gid();

 
        (void)printf("%6lu %4ld ", sb->st_ino, sb->st_blocks);
 
        (void)printf("%6lu %4ld ", sb->st_ino, sb->st_blocks);

-       if (strmode(sb->st_mode, &modep)) {
-               (void)fprintf(stderr, "find: %s.\n", strerror(errno));
-               exit(1);
-       }
+       (void)strmode(sb->st_mode, modep);

        (void)printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, UT_NAMESIZE,
            user_from_uid(sb->st_uid, 0), UT_NAMESIZE,
            group_from_gid(sb->st_gid, 0));
        (void)printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, UT_NAMESIZE,
            user_from_uid(sb->st_uid, 0), UT_NAMESIZE,
            group_from_gid(sb->st_gid, 0));


@@ -87,10 +100,11 @@ printlink(name)
        char *name;
 {
        int lnklen;
        char *name;
 {
        int lnklen;

-       char path[MAXPATHLEN + 1], *strerror();
+       char path[MAXPATHLEN + 1];

 
        if ((lnklen = readlink(name, path, MAXPATHLEN)) == -1) {
 
        if ((lnklen = readlink(name, path, MAXPATHLEN)) == -1) {

-               (void)fprintf(stderr, "\nfind: %s: %s\n", name, strerror(errno));
+               (void)fprintf(stderr,
+                   "\nfind: %s: %s\n", name, strerror(errno));

                return;
        }
        path[lnklen] = '\0';
                return;
        }
        path[lnklen] = '\0';