/*
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ * The Regents of the University of California. All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* Michael Fischbein.
*/
#ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)ls.c 5.58 (Berkeley) %G%";
+static char sccsid[] = "@(#)ls.c 8.2 (Berkeley) %G%";
#endif /* not lint */
-#include <sys/types.h>
+#include <sys/types.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
-#include <unistd.h>
+
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
#include <fts.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
-#include <stdio.h>
+#include <unistd.h>
+
#include "ls.h"
#include "extern.h"
-void display __P((int, FTSENT *, FTSENT *));
-int mastercmp __P((const FTSENT **, const FTSENT **));
-void traverse __P((int, char **, int));
+static void display __P((FTSENT *, FTSENT *));
+static int mastercmp __P((const FTSENT **, const FTSENT **));
+static void traverse __P((int, char **, int));
-static void (*printfcn) __P((FTSENT *, int, u_long, int));
+static void (*printfcn) __P((DISPLAY *));
static int (*sortfcn) __P((const FTSENT *, const FTSENT *));
+long blocksize; /* block size units */
int termwidth = 80; /* default terminal width */
/* 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_flags; /* show flags associated with a file */
int f_inode; /* print inode */
-int f_kblocks; /* print size in kilobytes */
int f_listdir; /* list actual directory, not contents */
int f_listdot; /* list files beginning with . */
int f_longform; /* long listing format */
int argc;
char *argv[];
{
+ static char dot[] = ".", *dotav[] = { dot, NULL };
struct winsize win;
- int ch, fts_options;
+ int ch, fts_options, notused;
char *p;
/* Terminal defaults to -Cq, non-terminal defaults to -1. */
- if (isatty(1)) {
- f_nonprint = 1;
- if (ioctl(1, TIOCGWINSZ, &win) == -1 || !win.ws_col) {
- if (p = getenv("COLUMNS"))
+ if (isatty(STDOUT_FILENO)) {
+ if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) == -1 ||
+ !win.ws_col) {
+ if ((p = getenv("COLUMNS")) != NULL)
termwidth = atoi(p);
}
else
termwidth = win.ws_col;
- f_column = 1;
+ f_column = f_nonprint = 1;
} else
f_singlecol = 1;
f_listdot = 1;
fts_options = FTS_PHYSICAL;
- while ((ch = getopt(argc, argv, "1ACFLRTacdfgikloqrstu")) != EOF) {
+ while ((ch = getopt(argc, argv, "1ACFLRTacdfgiloqrstu")) != EOF) {
switch (ch) {
/*
* The -1, -C and -l options all override each other so shell
f_longform = 1;
f_column = f_singlecol = 0;
break;
- /* -c and -u override each other */
+ /* The -c and -u options override each other. */
case 'c':
f_statustime = 1;
f_accesstime = 0;
case 'A':
f_listdot = 1;
break;
+ /* The -d option turns off the -R option. */
case 'S':
Sflg++; /* fall into... */
case 'd':
f_listdir = 1;
+ f_recursive = 0;
break;
case 'f':
f_nosort = 1;
break;
- case 'g':
- f_group = 1;
+ case 'g': /* Compatibility with 4.3BSD. */
break;
case 'i':
f_inode = 1;
break;
- case 'k':
- f_kblocks = 1;
- break;
case 'o':
f_flags = 1;
break;
argc -= optind;
argv += optind;
- /* The -d option turns off the -R option. */
- if (f_listdir)
- f_recursive = 0;
-
/*
* If not -F, -i, -l, -s or -t options, don't require stat
* information.
if (!f_longform && !f_listdir && !f_type)
fts_options |= FTS_COMFOLLOW;
+ /* If -l or -s, figure out block size. */
+ if (f_longform || f_size) {
+ (void)getbsize(¬used, &blocksize);
+ blocksize /= 512;
+ }
+
/* Select a sort function. */
if (f_reversesort) {
if (!f_timesort)
if (argc)
traverse(argc, argv, fts_options);
- else {
- static char dot[] = ".", *dotav[] = { dot, NULL };
+ else
traverse(1, dotav, fts_options);
- }
exit(0);
}
+static int output; /* If anything output. */
+
/*
* Traverse() walks the logical directory structure specified by the argv list
* in the order specified by the mastercmp() comparison function. During the
* traversal it passes linked lists of structures to display() which represent
* a superset (may be exact set) of the files to be displayed.
*/
-void
+static void
traverse(argc, argv, options)
int argc, options;
char *argv[];
{
- register FTS *ftsp;
- register FTSENT *p;
- register int is_ddot;
-
+ FTS *ftsp;
+ FTSENT *p, *chp;
+ int ch_options;
+
if ((ftsp =
fts_open(argv, options, f_nosort ? NULL : mastercmp)) == NULL)
- err(1, "fts_open: %s", strerror(errno));
+ err(1, NULL);
- display(argc, NULL, fts_children(ftsp));
+ display(NULL, fts_children(ftsp, 0));
if (f_listdir)
return;
- while (p = fts_read(ftsp))
- switch(p->fts_info) {
+
+ /*
+ * If not recursing down this tree and don't need stat info, just get
+ * the names.
+ */
+ ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0;
+
+ while ((p = fts_read(ftsp)) != NULL)
+ switch (p->fts_info) {
case FTS_DC:
- err(0, "%s: directory causes a cycle", p->fts_name);
+ warnx("%s: directory causes a cycle", p->fts_name);
break;
case FTS_DNR:
case FTS_ERR:
- err(0, "%s: %s",
- p->fts_name, strerror(p->fts_errno));
+ errno = p->fts_errno;
+ warn("%s", p->fts_name);
break;
case FTS_D:
if (p->fts_level != FTS_ROOTLEVEL &&
p->fts_name[0] == '.' && !f_listdot)
break;
- display(argc, p, fts_children(ftsp));
- if (!f_recursive)
+
+ /*
+ * If already output something, put out a newline as
+ * a separator. If multiple arguments, precede each
+ * directory with its name.
+ */
+ if (output)
+ (void)printf("\n%s:\n", p->fts_path);
+ else if (argc > 1) {
+ (void)printf("%s:\n", p->fts_path);
+ output = 1;
+ }
+
+ chp = fts_children(ftsp, ch_options);
+ display(p, chp);
+
+ if (!f_recursive && chp != NULL)
(void)fts_set(ftsp, p, FTS_SKIP);
break;
}
}
/*
- * Display() takes a linked list of FTSENT structures and based on the flags
- * set on the command line passes the list along with any other necessary
- * information to the print function (printfcn()). P always points to the
- * parent directory of the display list.
+ * Display() takes a linked list of FTSENT structures and passes the list
+ * along with any other necessary information to the print function. P
+ * points to the parent directory of the display list.
*/
-void
-display(argc, p, list)
- int argc;
- register FTSENT *p;
- FTSENT *list;
+static void
+display(p, list)
+ FTSENT *p, *list;
{
- register FTSENT *cur;
- u_long btotal;
- int entries, maxlen;
-
+ struct stat *sp;
+ DISPLAY d;
+ FTSENT *cur;
+ NAMES *np;
+ u_quad_t maxsize;
+ u_long btotal, maxblock, maxinode, maxlen, maxnlink;
+ int bcfile, flen, glen, ulen, maxflags, maxgroup, maxuser;
+ int entries, needstats;
+ char *user, *group, *flags, buf[20]; /* 32 bits == 10 digits */
+
/*
* If list is NULL there are two possibilities: that the parent
* directory p has no children, or that fts_children() returned an
* on the next call to fts_read() on the post-order visit to the
* directory p, and will be signalled in traverse().
*/
- if (list == NULL && (p->fts_level != FTS_ROOTLEVEL || argc != 1)) {
- (void)printf("\n%s:\n", p->fts_path);
+ if (list == NULL)
return;
- }
- /*
- * P can only be NULL if list is the argv list. This list must be
- * handled slightly differently due to the fact that there does not
- * exist a proper parent directory and different rules apply to it.
- */
- btotal = 0;
- maxlen = 0;
- if (p == NULL)
- for (cur = list, entries = 0; cur; cur = cur->fts_link) {
- if (cur->fts_info == FTS_ERR ||
- cur->fts_info == FTS_NS) {
- err(0, "%s: %s",
- cur->fts_name, strerror(cur->fts_errno));
- cur->fts_number = NO_PRINT;
- continue;
- }
- /*
- * If cur is a directory, do not print it out now. Its
- * contents will be printed out when fts_read() reads
- * it.
- */
- if (cur->fts_info == FTS_D && !f_listdir) {
- cur->fts_number = NO_PRINT;
- continue;
- }
- ++entries;
- if (f_nonprint)
- prcopy(cur->fts_name, cur->fts_name,
- cur->fts_namelen);
- if (f_column && cur->fts_namelen > maxlen)
- maxlen = cur->fts_namelen;
+ needstats = f_inode || f_longform || f_size;
+ flen = 0;
+ btotal = maxblock = maxinode = maxlen = maxnlink = 0;
+ bcfile = 0;
+ maxuser = maxgroup = maxflags = 0;
+ maxsize = 0;
+ for (cur = list, entries = 0; cur; cur = cur->fts_link) {
+ if (cur->fts_info == FTS_ERR || cur->fts_info == FTS_NS) {
+ errno = cur->fts_errno;
+ warn("%s", cur->fts_name);
+ cur->fts_number = NO_PRINT;
+ continue;
}
- else {
- if (p->fts_level != FTS_ROOTLEVEL || argc != 1)
- (void)printf("\n%s:\n", p->fts_path);
-
- for (cur = list, entries = 0; cur; cur = cur->fts_link) {
- if (cur->fts_info == FTS_ERR ||
- cur->fts_info == FTS_NS) {
- err(0, "%s: %s",
- cur->fts_name, strerror(cur->fts_errno));
+
+ /*
+ * P is NULL if list is the argv list, to which different rules
+ * apply.
+ */
+ if (p == NULL) {
+ /* Directories will be displayed later. */
+ if (cur->fts_info == FTS_D && !f_listdir) {
cur->fts_number = NO_PRINT;
continue;
}
- /* Don't display dot file if -a/-A not set. */
+ } else {
+ /* Only display dot file if -a/-A set. */
if (cur->fts_name[0] == '.' && !f_listdot) {
cur->fts_number = NO_PRINT;
continue;
}
- ++entries;
- if (f_nonprint)
- prcopy(cur->fts_name, cur->fts_name,
- cur->fts_namelen);
- if (f_column && cur->fts_namelen > maxlen)
- maxlen = cur->fts_namelen;
-
- if (f_longform || f_size)
- btotal += cur->fts_statp->st_blocks;
}
+ if (f_nonprint)
+ prcopy(cur->fts_name, cur->fts_name, cur->fts_namelen);
+ if (cur->fts_namelen > maxlen)
+ maxlen = cur->fts_namelen;
+ if (needstats) {
+ sp = cur->fts_statp;
+ if (sp->st_blocks > maxblock)
+ maxblock = sp->st_blocks;
+ if (sp->st_ino > maxinode)
+ maxinode = sp->st_ino;
+ if (sp->st_nlink > maxnlink)
+ maxnlink = sp->st_nlink;
+ if (sp->st_size > maxsize)
+ maxsize = sp->st_size;
+
+ btotal += sp->st_blocks;
+ if (f_longform) {
+ user = user_from_uid(sp->st_uid, 0);
+ if ((ulen = strlen(user)) > maxuser)
+ maxuser = ulen;
+ group = group_from_gid(sp->st_gid, 0);
+ if ((glen = strlen(group)) > maxgroup)
+ maxgroup = glen;
+ if (f_flags) {
+ flags =
+ flags_to_string(sp->st_flags, "-");
+ if ((flen = strlen(flags)) > maxflags)
+ maxflags = flen;
+ } else
+ flen = 0;
+
+ if ((np = malloc(sizeof(NAMES) +
+ ulen + glen + flen + 3)) == NULL)
+ err(1, NULL);
+
+ np->user = &np->data[0];
+ (void)strcpy(np->user, user);
+ np->group = &np->data[ulen + 1];
+ (void)strcpy(np->group, group);
+
+ if (S_ISCHR(sp->st_mode) ||
+ S_ISBLK(sp->st_mode))
+ bcfile = 1;
+
+ if (f_flags) {
+ np->flags = &np->data[ulen + glen + 2];
+ (void)strcpy(np->flags, flags);
+ }
+ cur->fts_pointer = np;
+ }
+ }
+ ++entries;
}
- if (entries)
- printfcn(list, entries, btotal, maxlen);
+ if (!entries)
+ return;
+
+ d.list = list;
+ d.entries = entries;
+ d.maxlen = maxlen;
+ if (needstats) {
+ d.bcfile = bcfile;
+ d.btotal = btotal;
+ (void)snprintf(buf, sizeof(buf), "%lu", maxblock);
+ d.s_block = strlen(buf);
+ d.s_flags = maxflags;
+ d.s_group = maxgroup;
+ (void)snprintf(buf, sizeof(buf), "%lu", maxinode);
+ d.s_inode = strlen(buf);
+ (void)snprintf(buf, sizeof(buf), "%lu", maxnlink);
+ d.s_nlink = strlen(buf);
+ (void)snprintf(buf, sizeof(buf), "%qu", maxsize);
+ d.s_size = strlen(buf);
+ d.s_user = maxuser;
+ }
+
+ printfcn(&d);
+ output = 1;
+
+ if (f_longform)
+ for (cur = list; cur; cur = cur->fts_link)
+ free(cur->fts_pointer);
}
/*
* as larger than directories. Within either group, use the sort function.
* All other levels use the sort function. Error entries remain unsorted.
*/
-int
+static int
mastercmp(a, b)
const FTSENT **a, **b;
{
- register int a_info, b_info;
+ int a_info, b_info;
a_info = (*a)->fts_info;
if (a_info == FTS_ERR)
if (a_info == FTS_NS || b_info == FTS_NS)
return (namecmp(*a, *b));
- if (a_info == b_info)
+ if (a_info == b_info)
return (sortfcn(*a, *b));
if ((*a)->fts_level == FTS_ROOTLEVEL)
- if (a_info == FTS_D)
+ if (a_info == FTS_D)
return (1);
else if (b_info == FTS_D)
return (-1);