shell_cmds-216.60.1.tar.gz

[apple/shell_cmds.git] / find / ls.c

diff --git a/find/ls.c b/find/ls.c
index cdce351297ea394dab5b8dc3fa5ddb4b74f38b4a..f58d9694275c0c160323916c9d5d8ff028b77bc3 100644 (file)
--- a/find/ls.c
+++ b/find/ls.c
@@ -1,5 +1,3 @@
-/*     $NetBSD: ls.c,v 1.10 1998/03/03 02:22:40 thorpej Exp $  */
-

 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.
 /*
  * Copyright (c) 1989, 1993
  *     The Regents of the University of California.  All rights reserved.


@@ -12,10 +10,6 @@
  * 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.
  * 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.
  * 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.


@@ -33,15 +27,15 @@
  * SUCH DAMAGE.
  */
 
  * SUCH DAMAGE.
  */
 

-#include <sys/cdefs.h>

 #ifndef lint
 #if 0
 #ifndef lint
 #if 0

-static char sccsid[] = "from: @(#)ls.c 8.1 (Berkeley) 6/6/93";
-#else
-__RCSID("$NetBSD: ls.c,v 1.10 1998/03/03 02:22:40 thorpej Exp $");
+static char sccsid[] = "@(#)ls.c       8.1 (Berkeley) 6/6/93";

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/usr.bin/find/ls.c,v 1.23 2011/09/28 18:53:36 ed Exp $");
+

 #include <sys/param.h>
 #include <sys/stat.h>
 
 #include <sys/param.h>
 #include <sys/stat.h>
 


@@ -49,42 +43,41 @@ __RCSID("$NetBSD: ls.c,v 1.10 1998/03/03 02:22:40 thorpej Exp $");
 #include <errno.h>
 #include <fts.h>
 #include <grp.h>
 #include <errno.h>
 #include <fts.h>
 #include <grp.h>

+#include <inttypes.h>
+#include <langinfo.h>

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

-#include <stdlib.h>

 #include <string.h>
 #include <time.h>
 #include <string.h>
 #include <time.h>

-#include <tzfile.h>

 #include <unistd.h>
 #include <unistd.h>

-#include <utmp.h>
+
+#ifdef __APPLE__
+#undef MAXLOGNAME
+#define MAXLOGNAME 17
+#endif /* __APPLE__ */

 
 #include "find.h"
 
 /* Derived from the print routines in the ls(1) source code. */
 
 
 #include "find.h"
 
 /* Derived from the print routines in the ls(1) source code. */
 

-static void printlink __P((char *));
-static void printtime __P((time_t));
+static void printlink(char *);
+static void printtime(time_t);

 
 void
 
 void

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

 {
        char modep[15];
 
 {
        char modep[15];
 

-       (void)printf("%6lu %4qd ", (u_long)sb->st_ino,
-           (long long)sb->st_blocks);
+       (void)printf("%6lu %8"PRId64" ", (u_long) sb->st_ino, sb->st_blocks);

        (void)strmode(sb->st_mode, modep);
        (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,
+       (void)printf("%s %3u %-*s %-*s ", modep, sb->st_nlink, MAXLOGNAME - 1,
+           user_from_uid(sb->st_uid, 0), MAXLOGNAME - 1,

            group_from_gid(sb->st_gid, 0));
 
        if (S_ISCHR(sb->st_mode) || S_ISBLK(sb->st_mode))
            group_from_gid(sb->st_gid, 0));
 
        if (S_ISCHR(sb->st_mode) || S_ISBLK(sb->st_mode))

-               (void)printf("%3d, %3d ", major(sb->st_rdev),
-                   minor(sb->st_rdev));
+               (void)printf("%#8jx ", (uintmax_t)sb->st_rdev);

        else
        else

-               (void)printf("%8qd ", (long long)sb->st_size);
+               (void)printf("%8"PRId64" ", sb->st_size);

        printtime(sb->st_mtime);
        (void)printf("%s", name);
        if (S_ISLNK(sb->st_mode))
        printtime(sb->st_mtime);
        (void)printf("%s", name);
        if (S_ISLNK(sb->st_mode))


@@ -93,36 +86,36 @@ printlong(name, accpath, sb)
 }
 
 static void
 }
 
 static void

-printtime(ftime)
-       time_t ftime;
+printtime(time_t ftime)

 {
 {

-       int i;
-       char *longstring;
-
-       longstring = ctime(&ftime);
-       for (i = 4; i < 11; ++i)
-               (void)putchar(longstring[i]);
-
-#define        SIXMONTHS       ((DAYSPERNYEAR / 2) * SECSPERDAY)
-       if (ftime + SIXMONTHS > time((time_t *)NULL))
-               for (i = 11; i < 16; ++i)
-                       (void)putchar(longstring[i]);
-       else {
-               (void)putchar(' ');
-               for (i = 20; i < 24; ++i)
-                       (void)putchar(longstring[i]);
-       }
-       (void)putchar(' ');
+       char longstring[80];
+       static time_t lnow;
+       const char *format;
+       static int d_first = -1;
+
+       if (d_first < 0)
+               d_first = (*nl_langinfo(D_MD_ORDER) == 'd');
+       if (lnow == 0)
+               lnow = time(NULL);
+
+#define        SIXMONTHS       ((365 / 2) * 86400)
+       if (ftime + SIXMONTHS > lnow && ftime < lnow + SIXMONTHS)
+               /* mmm dd hh:mm || dd mmm hh:mm */
+               format = d_first ? "%e %b %R " : "%b %e %R ";
+       else
+               /* mmm dd  yyyy || dd mmm  yyyy */
+               format = d_first ? "%e %b  %Y " : "%b %e  %Y ";
+       strftime(longstring, sizeof(longstring), format, localtime(&ftime));
+       fputs(longstring, stdout);

 }
 
 static void
 }
 
 static void

-printlink(name)
-       char *name;
+printlink(char *name)

 {
        int lnklen;
 {
        int lnklen;

-       char path[MAXPATHLEN + 1];
+       char path[MAXPATHLEN];

 
 

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

                warn("%s", name);
                return;
        }
                warn("%s", name);
                return;
        }