386BSD 0.1 development

Work on file usr/src/bin/ls/cmp.c
Work on file usr/src/bin/ls/ls.h
Work on file usr/src/bin/ls/print.c
Work on file usr/src/bin/ls/util.c

Co-Authored-By: Lynne Greer Jolitz <ljolitz@cardio.ucsf.edu>
Synthesized-from: 386BSD-0.1

diff --git a/usr/src/bin/ls/cmp.c b/usr/src/bin/ls/cmp.c
new file mode 100644 (file)
index 0000000..1c8d3d5
--- /dev/null
+++ b/usr/src/bin/ls/cmp.c
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Michael Fischbein.
+ *
+ * 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
+static char sccsid[] = "@(#)cmp.c      5.4 (Berkeley) 3/8/91";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include "ls.h"
+
+namecmp(a, b)
+       LS *a, *b;
+{
+       return(strcmp(a->name, b->name));
+}
+
+revnamecmp(a, b)
+       LS *a, *b;
+{
+       return(strcmp(b->name, a->name));
+}
+
+modcmp(a, b)
+       LS *a, *b;
+{
+       return(b->lstat.st_mtime - a->lstat.st_mtime);
+}
+
+revmodcmp(a, b)
+       LS *a, *b;
+{
+       return(a->lstat.st_mtime - b->lstat.st_mtime);
+}
+
+acccmp(a, b)
+       LS *a, *b;
+{
+       return(b->lstat.st_atime - a->lstat.st_atime);
+}
+
+revacccmp(a, b)
+       LS *a, *b;
+{
+       return(a->lstat.st_atime - b->lstat.st_atime);
+}
+
+statcmp(a, b)
+       LS *a, *b;
+{
+       return(b->lstat.st_ctime - a->lstat.st_ctime);
+}
+
+revstatcmp(a, b)
+       LS *a, *b;
+{
+       return(a->lstat.st_ctime - b->lstat.st_ctime);
+}

diff --git a/usr/src/bin/ls/ls.h b/usr/src/bin/ls/ls.h
new file mode 100644 (file)
index 0000000..2d30337
--- /dev/null
+++ b/usr/src/bin/ls/ls.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Michael Fischbein.
+ *
+ * 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.
+ *
+ *     @(#)ls.h        5.11 (Berkeley) 7/22/90
+ */
+
+typedef struct _lsstruct {
+       char *name;                     /* file name */
+       int len;                        /* file name length */
+       struct stat lstat;              /* lstat(2) for file */
+} LS;
+
+/*
+ * overload -- we probably have to save blocks and/or maxlen with the lstat
+ * array, so tabdir() stuffs it into unused fields in the first stat structure.
+ * If there's ever a type larger than u_long, fix this.  Any calls to qsort
+ * must save and restore the values.
+ */
+#define        st_btotal       st_flags
+#define        st_maxlen       st_gen
+
+extern int errno;
+
+extern int f_accesstime;       /* use time of last access */
+extern int f_group;            /* show group ownership of a file */
+extern int f_inode;            /* print inode */
+extern int f_kblocks;          /* print size in kilobytes */
+extern int f_longform;         /* long listing format */
+extern int f_sectime;          /* print the real time for all files */
+extern int f_singlecol;                /* use single column output */
+extern int f_size;             /* list size in short listing */
+extern int f_statustime;       /* use time of last mode change */
+extern int f_total;            /* if precede with "total" line */
+extern int f_type;             /* add type character for non-regular files */

diff --git a/usr/src/bin/ls/print.c b/usr/src/bin/ls/print.c
new file mode 100644 (file)
index 0000000..09ab426
--- /dev/null
+++ b/usr/src/bin/ls/print.c
@@ -0,0 +1,234 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Michael Fischbein.
+ *
+ * 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
+static char sccsid[] = "@(#)print.c    5.24 (Berkeley) 10/19/90";
+#endif /* not lint */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <grp.h>
+#include <pwd.h>
+#include <utmp.h>
+#include <tzfile.h>
+#include "ls.h"
+
+printscol(stats, num)
+       register LS *stats;
+       register int num;
+{
+       for (; num--; ++stats) {
+               (void)printaname(stats);
+               (void)putchar('\n');
+       }
+}
+
+printlong(stats, num)
+       LS *stats;
+       register int num;
+{
+       extern int errno;
+       char modep[15], *user_from_uid(), *group_from_gid(), *strerror();
+
+       if (f_total)
+               (void)printf("total %lu\n", f_kblocks ?
+                   howmany(stats[0].lstat.st_btotal, 2) :
+                   stats[0].lstat.st_btotal);
+       for (; num--; ++stats) {
+               if (f_inode)
+                       (void)printf("%6lu ", stats->lstat.st_ino);
+               if (f_size)
+                       (void)printf("%4ld ", f_kblocks ?
+                           howmany(stats->lstat.st_blocks, 2) :
+                           stats->lstat.st_blocks);
+               (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 ", UT_NAMESIZE,
+                           group_from_gid(stats->lstat.st_gid, 0));
+               if (S_ISCHR(stats->lstat.st_mode) ||
+                   S_ISBLK(stats->lstat.st_mode))
+                       (void)printf("%3d, %3d ", major(stats->lstat.st_rdev),
+                           minor(stats->lstat.st_rdev));
+               else
+                       (void)printf("%8ld ", stats->lstat.st_size);
+               if (f_accesstime)
+                       printtime(stats->lstat.st_atime);
+               else if (f_statustime)
+                       printtime(stats->lstat.st_ctime);
+               else
+                       printtime(stats->lstat.st_mtime);
+               (void)printf("%s", stats->name);
+               if (f_type)
+                       (void)printtype(stats->lstat.st_mode);
+               if (S_ISLNK(stats->lstat.st_mode))
+                       printlink(stats->name);
+               (void)putchar('\n');
+       }
+}
+
+#define        TAB     8
+
+printcol(stats, num)
+       LS *stats;
+       int num;
+{
+       extern int termwidth;
+       register int base, chcnt, cnt, col, colwidth;
+       int endcol, numcols, numrows, row;
+
+       colwidth = stats[0].lstat.st_maxlen;
+       if (f_inode)
+               colwidth += 6;
+       if (f_size)
+               colwidth += 5;
+       if (f_type)
+               colwidth += 1;
+
+       colwidth = (colwidth + TAB) & ~(TAB - 1);
+       if (termwidth < 2 * colwidth) {
+               printscol(stats, num);
+               return;
+       }
+
+       numcols = termwidth / colwidth;
+       numrows = num / numcols;
+       if (num % numcols)
+               ++numrows;
+
+       if (f_size && f_total)
+               (void)printf("total %lu\n", f_kblocks ?
+                   howmany(stats[0].lstat.st_btotal, 2) :
+                   stats[0].lstat.st_btotal);
+       for (row = 0; row < numrows; ++row) {
+               endcol = colwidth;
+               for (base = row, chcnt = col = 0; col < numcols; ++col) {
+                       chcnt += printaname(stats + base);
+                       if ((base += numrows) >= num)
+                               break;
+                       while ((cnt = (chcnt + TAB & ~(TAB - 1))) <= endcol) {
+                               (void)putchar('\t');
+                               chcnt = cnt;
+                       }
+                       endcol += colwidth;
+               }
+               putchar('\n');
+       }
+}
+
+/*
+ * print [inode] [size] name
+ * return # of characters printed, no trailing characters
+ */
+printaname(lp)
+       LS *lp;
+{
+       int chcnt;
+
+       chcnt = 0;
+       if (f_inode)
+               chcnt += printf("%5lu ", lp->lstat.st_ino);
+       if (f_size)
+               chcnt += printf("%4ld ", f_kblocks ?
+                   howmany(lp->lstat.st_blocks, 2) : lp->lstat.st_blocks);
+       chcnt += printf("%s", lp->name);
+       if (f_type)
+               chcnt += printtype(lp->lstat.st_mode);
+       return(chcnt);
+}
+
+printtime(ftime)
+       time_t ftime;
+{
+       int i;
+       char *longstring, *ctime();
+       time_t time();
+
+       longstring = ctime((long *)&ftime);
+       for (i = 4; i < 11; ++i)
+               (void)putchar(longstring[i]);
+
+#define        SIXMONTHS       ((DAYSPERNYEAR / 2) * SECSPERDAY)
+       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 {
+               (void)putchar(' ');
+               for (i = 20; i < 24; ++i)
+                       (void)putchar(longstring[i]);
+       }
+       (void)putchar(' ');
+}
+
+printtype(mode)
+       mode_t mode;
+{
+       switch(mode & S_IFMT) {
+       case S_IFDIR:
+               (void)putchar('/');
+               return(1);
+       case S_IFLNK:
+               (void)putchar('@');
+               return(1);
+       case S_IFSOCK:
+               (void)putchar('=');
+               return(1);
+       }
+       if (mode & (S_IXUSR | S_IXGRP | S_IXOTH)) {
+               (void)putchar('*');
+               return(1);
+       }
+       return(0);
+}
+
+printlink(name)
+       char *name;
+{
+       int lnklen;
+       char path[MAXPATHLEN + 1], *strerror();
+
+       if ((lnklen = readlink(name, path, MAXPATHLEN)) == -1) {
+               (void)fprintf(stderr, "\nls: %s: %s\n", name, strerror(errno));
+               return;
+       }
+       path[lnklen] = '\0';
+       (void)printf(" -> %s", path);
+}

diff --git a/usr/src/bin/ls/util.c b/usr/src/bin/ls/util.c
new file mode 100644 (file)
index 0000000..7c3861b
--- /dev/null
+++ b/usr/src/bin/ls/util.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Michael Fischbein.
+ *
+ * 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
+static char sccsid[] = "@(#)util.c     5.8 (Berkeley) 7/22/90";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <stdio.h>
+#include <ctype.h>
+
+prcopy(src, dest, len)
+       register char *src, *dest;
+       register int len;
+{
+       register int ch;
+
+       while(len--) {
+               ch = *src++;
+               *dest++ = isprint(ch) ? ch : '?';
+       }
+}
+
+char
+*emalloc(size)
+       u_int size;
+{
+       char *retval, *malloc();
+
+       if (!(retval = malloc(size)))
+               nomem();
+       return(retval);
+}
+
+nomem()
+{
+       (void)fprintf(stderr, "ls: out of memory.\n");
+       exit(1);
+}
+
+usage()
+{
+       (void)fprintf(stderr, "usage: ls [-1ACFLRTacdfgiklqrstu] [file ...]\n");
+       exit(1);
+}