getbsize now comes from libc

[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 b6b8999..ee10e84 100644 (file)
--- a/usr/src/bin/ls/print.c
+++ b/usr/src/bin/ls/print.c
@@ -9,86 +9,85 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)print.c    5.30 (Berkeley) %G%";
+static char sccsid[] = "@(#)print.c    8.1 (Berkeley) %G%";

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

-#include <fts.h>
-#include <time.h>
+
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

+#include <fts.h>

 #include <grp.h>
 #include <pwd.h>
 #include <grp.h>
 #include <pwd.h>

-#include <utmp.h>
-#include <tzfile.h>
-#include <stdlib.h>

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

+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <tzfile.h>
+#include <unistd.h>
+#include <utmp.h>
+

 #include "ls.h"
 #include "extern.h"
 #include "ls.h"
 #include "extern.h"

-       
-static char    *flags_from_fid __P((long));
-static int      printaname __P((FTSENT *));
-static void     printlink __P((FTSENT *));
-static void     printtime __P((time_t));
-static int      printtype __P((u_int));

 
 

-#define        IS_NOPRINT(e)   ((e)->fts_number == NO_PRINT)
+static int     printaname __P((FTSENT *, u_long, u_long));
+static void    printlink __P((FTSENT *));
+static void    printtime __P((time_t));
+static int     printtype __P((u_int));
+
+#define        IS_NOPRINT(p)   ((p)->fts_number == NO_PRINT)

 
 

-/* ARGUSED */

 void
 void

-printscol(dlist, entries, btotal, maxlen)
-       FTSENT *dlist;
-       int entries, maxlen;
-       u_long btotal;
+printscol(dp)
+       DISPLAY *dp;

 {
        register FTSENT *p;
 
 {
        register FTSENT *p;
 

-       for (p = dlist; p; p = p->fts_link)
-               if (!IS_NOPRINT(p)) {
-                       (void)printaname(p);
-                       (void)putchar('\n');
-               }
+       for (p = dp->list; p; p = p->fts_link) {
+               if (IS_NOPRINT(p))
+                       continue;
+               (void)printaname(p, dp->s_inode, dp->s_block);
+               (void)putchar('\n');
+       }

 }
 
 }
 

-/* ARGUSED */

 void
 void

-printlong(dlist, entries, btotal, maxlen)
-       FTSENT *dlist;
-       int entries, maxlen;
-       u_long btotal;
+printlong(dp)
+       DISPLAY *dp;

 {
        register FTSENT *p;
        register struct stat *sp;
 {
        register FTSENT *p;
        register struct stat *sp;

-       char modep[15], *user_from_uid(), *group_from_gid();
-       
-       
-       if (dlist->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
-               (void)printf("total %lu\n",
-                   f_kblocks ? howmany(btotal, 2) : btotal);
-       for (p = dlist; p; p = p->fts_link) {
+       NAMES *np;
+       char buf[20];
+
+       if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
+               (void)printf("total %lu\n", howmany(dp->btotal, blocksize));
+
+       for (p = dp->list; p; p = p->fts_link) {

                if (IS_NOPRINT(p))
                        continue;
                sp = p->fts_statp;
                if (f_inode)
                if (IS_NOPRINT(p))
                        continue;
                sp = p->fts_statp;
                if (f_inode)

-                       (void)printf("%6lu ", sp->st_ino);
+                       (void)printf("%*lu ", dp->s_inode, sp->st_ino);

                if (f_size)
                if (f_size)

-                       (void)printf("%4ld ", f_kblocks ?
-                           howmany(sp->st_blocks, 2) : sp->st_blocks);
-               (void)strmode(sp->st_mode, modep);
-               (void)printf("%s %3u %-*s ", modep, sp->st_nlink,
-                   UT_NAMESIZE, user_from_uid(sp->st_uid, 0));
-               if (f_group)
-                       (void)printf("%-*s ",
-                           UT_NAMESIZE, group_from_gid(sp->st_gid, 0));
+                       (void)printf("%*qd ",
+                           dp->s_block, howmany(sp->st_blocks, blocksize));
+               (void)strmode(sp->st_mode, buf);
+               np = p->fts_pointer;
+               (void)printf("%s %*u %-*s  %-*s  ", buf, dp->s_nlink,
+                   sp->st_nlink, dp->s_user, np->user, dp->s_group,
+                   np->group);

                if (f_flags)
                if (f_flags)

-                       (void)printf("%-*s ",
-                           FLAGSWIDTH, flags_from_fid(sp->st_flags));
-               if (S_ISCHR(sp->st_mode) ||
-                   S_ISBLK(sp->st_mode))
+                       (void)printf("%-*s ", dp->s_flags, np->flags);
+               if (S_ISCHR(sp->st_mode) || S_ISBLK(sp->st_mode))

                        (void)printf("%3d, %3d ",
                            major(sp->st_rdev), minor(sp->st_rdev));
                        (void)printf("%3d, %3d ",
                            major(sp->st_rdev), minor(sp->st_rdev));

+               else if (dp->bcfile)
+                       (void)printf("%*s%*qd ",
+                           8 - dp->s_size, "", dp->s_size, sp->st_size);

                else
                else

-                       (void)printf("%8ld ", sp->st_size);
+                       (void)printf("%*qd ", dp->s_size, sp->st_size);

                if (f_accesstime)
                        printtime(sp->st_atime);
                else if (f_statustime)
                if (f_accesstime)
                        printtime(sp->st_atime);
                else if (f_statustime)


@@ -107,10 +106,8 @@ printlong(dlist, entries, btotal, maxlen)
 #define        TAB     8
 
 void
 #define        TAB     8
 
 void

-printcol(dlist, entries, btotal, maxlen)
-       FTSENT *dlist;
-       u_long btotal;
-       int entries, maxlen;
+printcol(dp)
+       DISPLAY *dp;

 {
        extern int termwidth;
        static FTSENT **array;
 {
        extern int termwidth;
        static FTSENT **array;


@@ -123,29 +120,29 @@ printcol(dlist, entries, btotal, maxlen)
         * Have to do random access in the linked list -- build a table
         * of pointers.
         */
         * Have to do random access in the linked list -- build a table
         * of pointers.
         */

-       if (entries > lastentries) {
-               lastentries = entries;
+       if (dp->entries > lastentries) {
+               lastentries = dp->entries;

                if ((array =
                if ((array =

-                   realloc(array, entries * sizeof(FTSENT *))) == NULL) {
-                       err(0, "%s", strerror(errno));
-                       printscol(dlist, entries, btotal, maxlen);
+                   realloc(array, dp->entries * sizeof(FTSENT *))) == NULL) {
+                       warn(NULL);
+                       printscol(dp);

                }
        }
                }
        }

-       for (p = dlist, num = 0; p; p = p->fts_link)
+       for (p = dp->list, num = 0; p; p = p->fts_link)

                if (p->fts_number != NO_PRINT)
                        array[num++] = p;
 
                if (p->fts_number != NO_PRINT)
                        array[num++] = p;
 

-       colwidth = maxlen;
+       colwidth = dp->maxlen;

        if (f_inode)
        if (f_inode)

-               colwidth += 6;
+               colwidth += dp->s_inode + 1;

        if (f_size)
        if (f_size)

-               colwidth += 5;
+               colwidth += dp->s_block + 1;

        if (f_type)
                colwidth += 1;
 
        colwidth = (colwidth + TAB) & ~(TAB - 1);
        if (termwidth < 2 * colwidth) {
        if (f_type)
                colwidth += 1;
 
        colwidth = (colwidth + TAB) & ~(TAB - 1);
        if (termwidth < 2 * colwidth) {

-               printscol(dlist, 0, 0, 0);
+               printscol(dp);

                return;
        }
 
                return;
        }
 


@@ -154,13 +151,13 @@ printcol(dlist, entries, btotal, maxlen)
        if (num % numcols)
                ++numrows;
 
        if (num % numcols)
                ++numrows;
 

-       if (dlist->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
-               (void)printf("total %lu\n",
-                   f_kblocks ? howmany(btotal, 2) : btotal);
+       if (dp->list->fts_level != FTS_ROOTLEVEL && (f_longform || f_size))
+               (void)printf("total %lu\n", howmany(dp->btotal, blocksize));

        for (row = 0; row < numrows; ++row) {
                endcol = colwidth;
                for (base = row, chcnt = col = 0; col < numcols; ++col) {
        for (row = 0; row < numrows; ++row) {
                endcol = colwidth;
                for (base = row, chcnt = col = 0; col < numcols; ++col) {

-                       chcnt += printaname(array[base]);
+                       chcnt += printaname(array[base], dp->s_inode,
+                           dp->s_block);

                        if ((base += numrows) >= num)
                                break;
                        while ((cnt = (chcnt + TAB & ~(TAB - 1))) <= endcol) {
                        if ((base += numrows) >= num)
                                break;
                        while ((cnt = (chcnt + TAB & ~(TAB - 1))) <= endcol) {


@@ -178,8 +175,9 @@ printcol(dlist, entries, btotal, maxlen)
  * return # of characters printed, no trailing characters.
  */
 static int
  * return # of characters printed, no trailing characters.
  */
 static int

-printaname(p)
+printaname(p, inodefield, sizefield)

        register FTSENT *p;
        register FTSENT *p;

+       u_long sizefield, inodefield;

 {
        struct stat *sp;
        int chcnt;
 {
        struct stat *sp;
        int chcnt;


@@ -187,10 +185,10 @@ printaname(p)
        sp = p->fts_statp;
        chcnt = 0;
        if (f_inode)
        sp = p->fts_statp;
        chcnt = 0;
        if (f_inode)

-               chcnt += printf("%5lu ", sp->st_ino);
+               chcnt += printf("%*lu ", (int)inodefield, sp->st_ino);

        if (f_size)
        if (f_size)

-               chcnt += printf("%4ld ", f_kblocks ?
-                   howmany(sp->st_blocks, 2) : sp->st_blocks);
+               chcnt += printf("%*qd ",
+                   (int)sizefield, howmany(sp->st_blocks, blocksize));

        chcnt += printf("%s", p->fts_name);
        if (f_type)
                chcnt += printtype(sp->st_mode);
        chcnt += printf("%s", p->fts_name);
        if (f_type)
                chcnt += printtype(sp->st_mode);


@@ -204,7 +202,7 @@ printtime(ftime)
        int i;
        char *longstring;
 
        int i;
        char *longstring;
 

-       longstring = ctime((time_t *)&ftime);
+       longstring = ctime(&ftime);

        for (i = 4; i < 11; ++i)
                (void)putchar(longstring[i]);
 
        for (i = 4; i < 11; ++i)
                (void)putchar(longstring[i]);
 


@@ -212,7 +210,7 @@ printtime(ftime)
        if (f_sectime)
                for (i = 11; i < 24; i++)
                        (void)putchar(longstring[i]);
        if (f_sectime)
                for (i = 11; i < 24; i++)
                        (void)putchar(longstring[i]);

-       else if (ftime + SIXMONTHS > time((time_t *)NULL))
+       else if (ftime + SIXMONTHS > time(NULL))

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


@@ -252,43 +250,16 @@ printlink(p)
        int lnklen;
        char name[MAXPATHLEN + 1], path[MAXPATHLEN + 1];
 
        int lnklen;
        char name[MAXPATHLEN + 1], path[MAXPATHLEN + 1];
 

-        if (p->fts_level == FTS_ROOTLEVEL)
-                (void)snprintf(name, MAXPATHLEN, "%s", p->fts_name);
-        else
-               (void)snprintf(name,
-                   MAXPATHLEN, "%s/%s", p->fts_parent->fts_name,  p->fts_name);

 
 

-       if ((lnklen = readlink(name, path, MAXPATHLEN)) == -1) {
+       if (p->fts_level == FTS_ROOTLEVEL)
+               (void)snprintf(name, sizeof(name), "%s", p->fts_name);
+       else 
+               (void)snprintf(name, sizeof(name),
+                   "%s/%s", p->fts_path, p->fts_name);
+       if ((lnklen = readlink(name, path, sizeof(name) - 1)) == -1) {

                (void)fprintf(stderr, "\nls: %s: %s\n", name, strerror(errno));
                return;
        }
        path[lnklen] = '\0';
        (void)printf(" -> %s", path);
 }
                (void)fprintf(stderr, "\nls: %s: %s\n", name, strerror(errno));
                return;
        }
        path[lnklen] = '\0';
        (void)printf(" -> %s", path);
 }

-
-static char *
-flags_from_fid(flags)
-       long flags;
-{
-       static char buf[FLAGSWIDTH + 1];
-       int size;
-
-       size = FLAGSWIDTH;
-       buf[0] = '\0';
-       if (size && (flags & NODUMP)) {
-               strncat(buf, "nodump", size);
-               size -= 6;
-       } else {
-               strncat(buf, "dump", size);
-               size -= 4;
-       }
-       if (size && (flags & IMMUTABLE)) {
-               strncat(buf, ",nochg", size);
-               size -= 6;
-       }
-       if (size && (flags & ARCHIVED)) {
-               strncat(buf, ",arch", size);
-               size -= 5;
-       }
-       return (buf);
-}