get redistribution notice from /usr/share/misc

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

diff --git a/usr/src/bin/ls/ls.c b/usr/src/bin/ls/ls.c
index 4043ad5..94c3447 100644 (file)
--- a/usr/src/bin/ls/ls.c
+++ b/usr/src/bin/ls/ls.c
@@ -5,17 +5,7 @@
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
  *
  * This code is derived from software contributed to Berkeley by
  * Michael Fischbein.
  *

- * 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.
+%sccs.include.redist.c%

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -25,7 +15,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)ls.c       5.22 (Berkeley) %G%";
+static char sccsid[] = "@(#)ls.c       5.37 (Berkeley) %G%";

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


@@ -37,28 +27,35 @@ static char sccsid[] = "@(#)ls.c    5.22 (Berkeley) %G%";
 #include <stdio.h>
 #include "ls.h"
 
 #include <stdio.h>
 #include "ls.h"
 

+int (*sortfcn)(), (*printfcn)();

 int lstat(), strlen();
 char *emalloc();
 
 int lstat(), strlen();
 char *emalloc();
 

-int    qflg, Aflg, Cflg, Fflg, Lflg, Rflg, Sflg;
+int termwidth = 80;            /* default terminal width */

 
 /* flags */
 int f_accesstime;              /* use time of last access */
 
 /* flags */
 int f_accesstime;              /* use time of last access */

+int f_column;                  /* columnated format */

 int f_group;                   /* show group ownership of a file */
 int f_ignorelink;              /* indirect through symbolic link operands */
 int f_inode;                   /* print inode */
 int f_group;                   /* show group ownership of a file */
 int f_ignorelink;              /* indirect through symbolic link operands */
 int f_inode;                   /* print inode */

+int f_kblocks;                 /* print size in kilobytes */

 int f_listalldot;              /* list . and .. as well */
 int f_listdir;                 /* list actual directory, not contents */
 int f_listdot;                 /* list files beginning with . */
 int f_longform;                        /* long listing format */
 int f_listalldot;              /* list . and .. as well */
 int f_listdir;                 /* list actual directory, not contents */
 int f_listdot;                 /* list files beginning with . */
 int f_longform;                        /* long listing format */

+int f_needstat;                        /* if need to stat files */
+int f_newline;                 /* if precede with newline */

 int f_nonprint;                        /* show unprintables as ? */
 int f_nonprint;                        /* show unprintables as ? */

+int f_nosort;                  /* don't sort output */

 int f_recursive;               /* ls subdirectories also */
 int f_reversesort;             /* reverse whatever sort is used */
 int f_singlecol;               /* use single column output */
 int f_size;                    /* list size in short listing */
 int f_recursive;               /* ls subdirectories also */
 int f_reversesort;             /* reverse whatever sort is used */
 int f_singlecol;               /* use single column output */
 int f_size;                    /* list size in short listing */

-int f_specialdir;              /* force params to be directories */

 int f_statustime;              /* use time of last mode change */
 int f_statustime;              /* use time of last mode change */

+int f_dirname;                 /* if precede with directory name */

 int f_timesort;                        /* sort by time vice name */
 int f_timesort;                        /* sort by time vice name */

+int f_total;                   /* if precede with "total" line */

 int f_type;                    /* add type character for non-regular files */
 
 main(argc, argv)
 int f_type;                    /* add type character for non-regular files */
 
 main(argc, argv)


@@ -66,25 +63,23 @@ main(argc, argv)
        char **argv;
 {
        extern int optind, stat();
        char **argv;
 {
        extern int optind, stat();

-       struct sgttyb sgbuf;

        struct winsize win;
        int ch;
        char *p, *getenv();
        struct winsize win;
        int ch;
        char *p, *getenv();

-       int namecmp(), revnamecmp(), acccmp(), revacccmp();
-       int modcmp(), revmodcmp(), statcmp(), revstatcmp();
-       int printcol(), printlong(), printscol();
+       int acccmp(), bcopy(), modcmp(), namecmp(), prcopy(), printcol();
+       int printlong(), printscol(), revacccmp(), revmodcmp(), revnamecmp();
+       int revstatcmp(), statcmp();

 
 

-       /*
-        * terminal defaults to -C -q
-        * non-terminal defaults to -1
-        */
+       /* terminal defaults to -Cq, non-terminal defaults to -1 */

        if (isatty(1)) {
                f_nonprint = 1;
        if (isatty(1)) {
                f_nonprint = 1;

-               (void)ioctl(1, TIOCGETP, &sgbuf);
-               if (ioctl(1, TIOCGWINSZ, &win) == -1 || !win.ws_col)
-                       termwidth = (p = getenv("COLUMNS")) ? atoi(p) : 80;
+               if (ioctl(1, TIOCGWINSZ, &win) == -1 || !win.ws_col) {
+                       if (p = getenv("COLUMNS"))
+                               termwidth = atoi(p);
+               }

                else
                        termwidth = win.ws_col;
                else
                        termwidth = win.ws_col;

+               f_column = 1;

        } else
                f_singlecol = 1;
 
        } else
                f_singlecol = 1;
 


@@ -92,7 +87,7 @@ main(argc, argv)
        if (!getuid())
                f_listdot = 1;
 
        if (!getuid())
                f_listdot = 1;
 

-       while ((ch = getopt(argc, argv, "1ACFLRacdfgilqrstu")) != EOF) {
+       while ((ch = getopt(argc, argv, "1ACFLRacdfgiklqrstu")) != EOF) {

                switch (ch) {
                /*
                 * -1, -C and -l all override each other
                switch (ch) {
                /*
                 * -1, -C and -l all override each other


@@ -100,14 +95,15 @@ main(argc, argv)
                 */
                case '1':
                        f_singlecol = 1;
                 */
                case '1':
                        f_singlecol = 1;

-                       f_longform = 0;
+                       f_column = f_longform = 0;

                        break;
                case 'C':
                        break;
                case 'C':

+                       f_column = 1;

                        f_longform = f_singlecol = 0;
                        break;
                case 'l':
                        f_longform = 1;
                        f_longform = f_singlecol = 0;
                        break;
                case 'l':
                        f_longform = 1;

-                       f_singlecol = 0;
+                       f_column = f_singlecol = 0;

                        break;
                /* -c and -u override each other */
                case 'c':
                        break;
                /* -c and -u override each other */
                case 'c':


@@ -139,7 +135,7 @@ main(argc, argv)
                        f_listdir = 1;
                        break;
                case 'f':
                        f_listdir = 1;
                        break;
                case 'f':

-                       f_specialdir = 1;
+                       f_nosort = 1;

                        break;
                case 'g':
                        f_group = 1;
                        break;
                case 'g':
                        f_group = 1;


@@ -147,6 +143,9 @@ main(argc, argv)
                case 'i':
                        f_inode = 1;
                        break;
                case 'i':
                        f_inode = 1;
                        break;

+               case 'k':
+                       f_kblocks = 1;
+                       break;

                case 'q':
                        f_nonprint = 1;
                        break;
                case 'q':
                        f_nonprint = 1;
                        break;


@@ -167,19 +166,13 @@ main(argc, argv)
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       /* -f turns off -F, -R, -l, -t, -s, -r, turns on -a */
-       if (f_specialdir) {
-               f_longform = f_recursive = f_reversesort = f_size =
-               f_timesort = f_type = 0;
-               f_listdot = f_listalldot = 1;
-       }
-

        /* -d turns off -R */
        if (f_listdir)
                f_recursive = 0;
 
        /* if need to stat files */
        /* -d turns off -R */
        if (f_listdir)
                f_recursive = 0;
 
        /* if need to stat files */

-       needstat = f_longform || f_recursive || f_timesort || f_size || f_type;
+       f_needstat = f_longform || f_recursive || f_timesort ||
+           f_size || f_type;

 
        /* select a sort function */
        if (f_reversesort) {
 
        /* select a sort function */
        if (f_reversesort) {


@@ -210,25 +203,13 @@ main(argc, argv)
        else
                printfcn = printcol;
 
        else
                printfcn = printcol;
 

-       if (argc)
-               doargs(argc, argv);
-       else
-               dodot();
-       exit(0);
-}
-
-dodot()
-{
-       LS local, *stats;
-       int num;
-       char *names;
-
-       if (lstat(local.name = ".", &local.lstat)) {
-               (void)fprintf(stderr, "ls: .: %s\n", strerror(errno));
-               exit(1);
+       if (!argc) {
+               argc = 1;
+               argv[0] = ".";
+               argv[1] = NULL;

        }
        }

-       if (num = tabdir(&local, &stats, &names))
-               displaydir(stats, num);
+       doargs(argc, argv);
+       exit(0);

 }
 
 static char path[MAXPATHLEN + 1];
 }
 
 static char path[MAXPATHLEN + 1];


@@ -239,28 +220,30 @@ doargs(argc, argv)
        char **argv;
 {
        register LS *dstatp, *rstatp;
        char **argv;
 {
        register LS *dstatp, *rstatp;

+       register int cnt, dircnt, maxlen, regcnt;

        LS *dstats, *rstats;
        LS *dstats, *rstats;

-       register int cnt, dircnt, regcnt;

        struct stat sb;
        struct stat sb;

-       LS *stats;
-       int num, (*statfcn)(), stat(), lstat();
-       char *names, top[MAXPATHLEN + 1];
+       int (*statfcn)(), stat(), lstat();
+       char top[MAXPATHLEN + 1];
+       u_long blocks;

 
        /*
         * walk through the operands, building separate arrays of LS
         * structures for directory and non-directory files.
         */
        dstats = rstats = NULL;
 
        /*
         * walk through the operands, building separate arrays of LS
         * structures for directory and non-directory files.
         */
        dstats = rstats = NULL;

-       statfcn = f_ignorelink ? stat : lstat;
+       statfcn = (f_longform || f_listdir) && !f_ignorelink ? lstat : stat;

        for (dircnt = regcnt = 0; *argv; ++argv) {
                if (statfcn(*argv, &sb)) {
        for (dircnt = regcnt = 0; *argv; ++argv) {
                if (statfcn(*argv, &sb)) {

-                       (void)fprintf(stderr, "ls: %s: %s\n",
-                           *argv, strerror(errno));
-                       if (errno == ENOENT)
-                               continue;
-                       exit(1);
+                       if (statfcn != stat || lstat(*argv, &sb)) {
+                               (void)fprintf(stderr, "ls: %s: %s\n", *argv,
+                                   strerror(errno));
+                               if (errno == ENOENT)
+                                       continue;
+                               exit(1);
+                       }

                }
                }

-               if (!f_specialdir && !f_listdir && S_ISDIR(sb.st_mode)) {
+               if (S_ISDIR(sb.st_mode) && !f_listdir) {

                        if (!dstats)
                                dstatp = dstats = (LS *)emalloc((u_int)argc *
                                    (sizeof(LS)));
                        if (!dstats)
                                dstatp = dstats = (LS *)emalloc((u_int)argc *
                                    (sizeof(LS)));


@@ -270,44 +253,55 @@ doargs(argc, argv)
                        ++dircnt;
                }
                else {
                        ++dircnt;
                }
                else {

-                       if (!rstats)
+                       if (!rstats) {

                                rstatp = rstats = (LS *)emalloc((u_int)argc *
                                    (sizeof(LS)));
                                rstatp = rstats = (LS *)emalloc((u_int)argc *
                                    (sizeof(LS)));

+                               blocks = 0;
+                               maxlen = -1;
+                       }

                        rstatp->name = *argv;
                        rstatp->lstat = sb;
                        rstatp->name = *argv;
                        rstatp->lstat = sb;

+
+                       /* save name length for -C format */
+                       rstatp->len = strlen(*argv);
+
+                       if (f_nonprint)
+                               prcopy(*argv, *argv, rstatp->len);
+
+                       /* calculate number of blocks if -l/-s formats */
+                       if (f_longform || f_size)
+                               blocks += sb.st_blocks;
+
+                       /* save max length if -C format */
+                       if (f_column && maxlen < rstatp->len)
+                               maxlen = rstatp->len;
+

                        ++rstatp;
                        ++regcnt;
                }
        }
        /* display regular files */
        if (regcnt) {
                        ++rstatp;
                        ++regcnt;
                }
        }
        /* display regular files */
        if (regcnt) {

-               /*
-                * for -f flag -- switch above treats all -f operands as
-                * regular files; this code uses tabdir() to read
-                * them as directories.
-                */
-               if (f_specialdir) {
-                       for (cnt = regcnt; cnt--;) {
-                               if (num = tabdir(rstats++, &stats, &names))
-                                       displaydir(stats, num);
-                               (void)free((char *)stats);
-                               (void)free((char *)names);
-                       }
-               } else
-                       displaydir(rstats, regcnt);
+               rstats[0].lstat.st_btotal = blocks;
+               rstats[0].lstat.st_maxlen = maxlen;
+               displaydir(rstats, regcnt);
+               f_newline = f_dirname = 1;

        }
        /* display directories */
        if (dircnt) {
                register char *p;
 
        }
        /* display directories */
        if (dircnt) {
                register char *p;
 

+               f_total = 1;

                if (dircnt > 1) {
                        (void)getwd(top);
                        qsort((char *)dstats, dircnt, sizeof(LS), sortfcn);
                if (dircnt > 1) {
                        (void)getwd(top);
                        qsort((char *)dstats, dircnt, sizeof(LS), sortfcn);

+                       f_dirname = 1;

                }
                for (cnt = 0; cnt < dircnt; ++dstats) {
                        for (endofpath = path, p = dstats->name;
                            *endofpath = *p++; ++endofpath);
                }
                for (cnt = 0; cnt < dircnt; ++dstats) {
                        for (endofpath = path, p = dstats->name;
                            *endofpath = *p++; ++endofpath);

-                       subdir(dstats, regcnt, regcnt || dircnt > 1);
+                       subdir(dstats);
+                       f_newline = 1;

                        if (++cnt < dircnt && chdir(top)) {
                                (void)fprintf(stderr, "ls: %s: %s\n",
                                    top, strerror(errno));
                        if (++cnt < dircnt && chdir(top)) {
                                (void)fprintf(stderr, "ls: %s: %s\n",
                                    top, strerror(errno));


@@ -323,12 +317,15 @@ displaydir(stats, num)
 {
        register char *p, *savedpath;
        LS *lp;
 {
        register char *p, *savedpath;
        LS *lp;

-       u_long save;

 
 

-       if (num > 1 && !f_specialdir) {
-               save = stats[0].lstat.st_flags;
+       if (num > 1 && !f_nosort) {
+               u_long save1, save2;
+
+               save1 = stats[0].lstat.st_btotal;
+               save2 = stats[0].lstat.st_maxlen;

                qsort((char *)stats, num, sizeof(LS), sortfcn);
                qsort((char *)stats, num, sizeof(LS), sortfcn);

-               stats[0].lstat.st_flags = save;
+               stats[0].lstat.st_btotal = save1;
+               stats[0].lstat.st_maxlen = save2;

        }
 
        printfcn(stats, num);
        }
 
        printfcn(stats, num);


@@ -344,42 +341,35 @@ displaydir(stats, num)
                        if (endofpath != path && endofpath[-1] != '/')
                                *endofpath++ = '/';
                        for (; *endofpath = *p++; ++endofpath);
                        if (endofpath != path && endofpath[-1] != '/')
                                *endofpath++ = '/';
                        for (; *endofpath = *p++; ++endofpath);

-                       subdir(lp, 1, 1);
+                       f_newline = f_dirname = f_total = 1;
+                       subdir(lp);

                        *(endofpath = savedpath) = '\0';
                }
        }
 }
 
                        *(endofpath = savedpath) = '\0';
                }
        }
 }
 

-subdir(lp, newline, tag)
+subdir(lp)

        LS *lp;
        LS *lp;

-       int newline, tag;

 {
        LS *stats;
        int num;
        char *names;
 
 {
        LS *stats;
        int num;
        char *names;
 

-       /*
-        * this doesn't really belong here, but it's the only place that
-        * everybody goes through; the `tag' variable is so that we don't
-        * print the header for directories unless we're going to display
-        * more directories, or we've already displayed files or directories.
-        * The `newline' variable keeps us from inserting a newline before
-        * we've displayed anything at all.
-        */
-       if (newline)
+       if (f_newline)

                (void)putchar('\n');
                (void)putchar('\n');

-       if (tag)
+       if (f_dirname)

                (void)printf("%s:\n", path);
 
        if (chdir(lp->name)) {
                (void)printf("%s:\n", path);
 
        if (chdir(lp->name)) {

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

                return;
        }
                return;
        }

-       if (num = tabdir(lp, &stats, &names))
+       if (num = tabdir(lp, &stats, &names)) {

                displaydir(stats, num);
                displaydir(stats, num);

-       (void)free((char *)stats);
-       (void)free((char *)names);
+               (void)free((char *)stats);
+               (void)free((char *)names);
+       }

        if (chdir("..")) {
                (void)fprintf(stderr, "ls: ..: %s\n", strerror(errno));
                exit(1);
        if (chdir("..")) {
                (void)fprintf(stderr, "ls: ..: %s\n", strerror(errno));
                exit(1);


@@ -397,23 +387,13 @@ tabdir(lp, s_stats, s_names)
        u_long blocks;
        LS *stats;
 
        u_long blocks;
        LS *stats;
 

-       /*
-        * allocate space for array of LS structures and the file names
-        * the name field will point to.  Make it big so we don't have
-        * to realloc often.
-        */
-#define        DEFNUM  256
-       maxentry = DEFNUM;
-       *s_stats = stats = (LS *)emalloc((u_int)DEFNUM * sizeof(LS));
-       *s_names = names = emalloc((u_int)lp->lstat.st_size);
-
-       if (!(dirp = opendir(f_specialdir ? lp->name : "."))) {
+       if (!(dirp = opendir("."))) {

                (void)fprintf(stderr, "ls: %s: %s\n", lp->name,
                    strerror(errno));
                return(0);
        }
                (void)fprintf(stderr, "ls: %s: %s\n", lp->name,
                    strerror(errno));
                return(0);
        }

-       blocks = 0;
-       maxlen = -1;
+       blocks = maxentry = maxlen = 0;
+       stats = NULL;

        for (cnt = 0; dp = readdir(dirp);) {
                /* this does -A and -a */
                p = dp->d_name;
        for (cnt = 0; dp = readdir(dirp);) {
                /* this does -A and -a */
                p = dp->d_name;


@@ -424,12 +404,16 @@ tabdir(lp, s_stats, s_names)
                                continue;
                }
                if (cnt == maxentry) {
                                continue;
                }
                if (cnt == maxentry) {

+                       if (!maxentry)
+                               *s_names = names =
+                                   emalloc((u_int)lp->lstat.st_size);
+#define        DEFNUM  256

                        maxentry += DEFNUM;
                        maxentry += DEFNUM;

-                       if (!(stats = (LS *)realloc((char *)stats,
+                       if (!(*s_stats = stats = (LS *)realloc((char *)stats,

                            (u_int)maxentry * sizeof(LS))))
                                nomem();
                }
                            (u_int)maxentry * sizeof(LS))))
                                nomem();
                }

-               if (needstat && lstat(dp->d_name, &stats[cnt].lstat)) {
+               if (f_needstat && lstat(dp->d_name, &stats[cnt].lstat)) {

                        (void)fprintf(stderr, "ls: %s: %s\n",
                            dp->d_name, strerror(errno));
                        if (errno == ENOENT)
                        (void)fprintf(stderr, "ls: %s: %s\n",
                            dp->d_name, strerror(errno));
                        if (errno == ENOENT)


@@ -438,7 +422,6 @@ tabdir(lp, s_stats, s_names)
                }
                stats[cnt].name = names;
 
                }
                stats[cnt].name = names;
 

-               /* strip out unprintables */

                if (f_nonprint)
                        prcopy(dp->d_name, names, (int)dp->d_namlen);
                else
                if (f_nonprint)
                        prcopy(dp->d_name, names, (int)dp->d_namlen);
                else


@@ -454,25 +437,24 @@ tabdir(lp, s_stats, s_names)
 
                /* save name length for -C format */
                stats[cnt].len = dp->d_namlen;
 
                /* save name length for -C format */
                stats[cnt].len = dp->d_namlen;

-               /* calculate number of blocks if -l format */
-               if (f_longform)
+
+               /* calculate number of blocks if -l/-s formats */
+               if (f_longform || f_size)

                        blocks += stats[cnt].lstat.st_blocks;
                        blocks += stats[cnt].lstat.st_blocks;

+

                /* save max length if -C format */
                /* save max length if -C format */

-               else if (!f_singlecol && maxlen < (int)dp->d_namlen)
+               if (f_column && maxlen < (int)dp->d_namlen)

                        maxlen = dp->d_namlen;
                ++cnt;
        }
                        maxlen = dp->d_namlen;
                ++cnt;
        }

-       /*
-        * overload -- we probably have to save either blocks or maxlen
-        * with the lstat array, so we stuff it into an unused field in
-        * the first stat structure.  If there's ever a type larger than
-        * u_long, fix this.  This information must be saved if qsort
-        * is called.
-        */
-       if (f_longform)
-               stats[0].lstat.st_flags = blocks;
-       else if (!f_singlecol)
-               stats[0].lstat.st_flags = maxlen;
-       closedir(dirp);
+       (void)closedir(dirp);
+
+       if (cnt) {
+               stats[0].lstat.st_btotal = blocks;
+               stats[0].lstat.st_maxlen = maxlen;
+       } else if (stats) {
+               (void)free((char *)stats);
+               (void)free((char *)names);
+       }

        return(cnt);
 }
        return(cnt);
 }