BSD 4_3_Net_2 release

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

diff --git a/usr/src/bin/ls/print.c b/usr/src/bin/ls/print.c
index 0088263..09ab426 100644 (file)
--- a/usr/src/bin/ls/print.c
+++ b/usr/src/bin/ls/print.c
@@ -5,11 +5,37 @@
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
  *
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
  *

-%sccs.include.redist.c%
+ * 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[] = "@(#)print.c    5.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)print.c    5.24 (Berkeley) 10/19/90";

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


@@ -36,8 +62,7 @@ printlong(stats, num)
        register int num;
 {
        extern int errno;
        register int num;
 {
        extern int errno;

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

 
        if (f_total)
                (void)printf("total %lu\n", f_kblocks ?
 
        if (f_total)
                (void)printf("total %lu\n", f_kblocks ?


@@ -50,10 +75,7 @@ printlong(stats, num)
                        (void)printf("%4ld ", f_kblocks ?
                            howmany(stats->lstat.st_blocks, 2) :
                            stats->lstat.st_blocks);
                        (void)printf("%4ld ", f_kblocks ?
                            howmany(stats->lstat.st_blocks, 2) :
                            stats->lstat.st_blocks);

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

                (void)printf("%s %3u %-*s ", modep, stats->lstat.st_nlink,
                    UT_NAMESIZE, user_from_uid(stats->lstat.st_uid, 0));
                if (f_group)
                (void)printf("%s %3u %-*s ", modep, stats->lstat.st_nlink,
                    UT_NAMESIZE, user_from_uid(stats->lstat.st_uid, 0));
                if (f_group)


@@ -162,7 +184,10 @@ printtime(ftime)
                (void)putchar(longstring[i]);
 
 #define        SIXMONTHS       ((DAYSPERNYEAR / 2) * SECSPERDAY)
                (void)putchar(longstring[i]);
 
 #define        SIXMONTHS       ((DAYSPERNYEAR / 2) * SECSPERDAY)

-       if (ftime + SIXMONTHS > time((time_t *)NULL))
+       if (f_sectime)
+               for (i = 11; i < 24; i++)
+                       (void)putchar(longstring[i]);
+       else if (ftime + SIXMONTHS > time((time_t *)NULL))

                for (i = 11; i < 16; ++i)
                        (void)putchar(longstring[i]);
        else {
                for (i = 11; i < 16; ++i)
                        (void)putchar(longstring[i]);
        else {