*
* See http://opengroup.org/onlinepubs/9699919799/utilities/ls.html
-// "[-Cl]"
-USE_LS(NEWTOY(ls, "goACFHLRSacdfiklmnpqrstux1", TOYFLAG_BIN))
+USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]", TOYFLAG_BIN|TOYFLAG_LOCALE))
config LS
bool "ls"
default y
help
- usage: ls [-ACFHLRSacdfiklmnpqrstux1] [directory...]
+ usage: ls [-ACFHLRSZacdfiklmnpqrstux1] [directory...]
list files
what to show:
- -a all files including .hidden
- -c use ctime for timestamps
- -d directory, not contents
- -i inode number
- -k block sizes in kilobytes
- -p put a '/' after directory names
- -q unprintable chars as '?'
- -s size (in blocks)
- -u use access time for timestamps
- -A list all files except . and ..
- -H follow command line symlinks
- -L follow symlinks
- -R recursively list files in subdirectories
- -F append file type indicator (/=dir, *=exe, @=symlink, |=FIFO)
+ -a all files including .hidden -c use ctime for timestamps
+ -d directory, not contents -i inode number
+ -k block sizes in kilobytes -p put a '/' after dir names
+ -q unprintable chars as '?' -s size (in blocks)
+ -u use access time for timestamps -A list all files but . and ..
+ -H follow command line symlinks -L follow symlinks
+ -R recursively list files in subdirs -F append /dir *exe @sym |FIFO
+ -Z security context
output formats:
- -1 list one file per line
- -C columns (sorted vertically)
- -g like -l but no owner
- -l long (show full details for each file)
- -m comma separated
- -n like -l but numeric uid/gid
- -o like -l but no group
- -x columns (sorted horizontally)
+ -1 list one file per line -C columns (sorted vertically)
+ -g like -l but no owner -l long (show full details)
+ -m comma separated -n like -l but numeric uid/gid
+ -o like -l but no group -x columns (horizontal sort)
sorting (default is alphabetical):
- -f unsorted
- -r reverse
- -t timestamp
- -S size
+ -f unsorted -r reverse -t timestamp -S size
+
+config LS_COLOR
+ bool "ls --color"
+ default y
+ depends on LS
+ help
+ usage: ls --color[=auto]
+
+ --color device=yellow symlink=turquoise/red dir=blue socket=purple
+ files: exe=green suid=red suidfile=redback stickydir=greenback
+ =auto means detect if output is a tty.
*/
#define FOR_ls
// ls -lR starts .: then ./subdir:
GLOBALS(
- struct dirtree *files;
+ char *color;
+
+ struct dirtree *files, *singledir;
unsigned screen_width;
int nl_title;
-
- // group and user can make overlapping use of the utoa() buf, so move it
- char uid_buf[12];
+ char uid_buf[12], gid_buf[12];
)
-void dlist_to_dirtree(struct dirtree *parent)
+// Does two things: 1) Returns wcwidth(utf8) version of strlen,
+// 2) replaces unprintable characters input string with '?' wildcard char.
+int strwidth(char *s)
{
- // Turn double_list into dirtree
- struct dirtree *dt = parent->child;
- if (dt) {
- dt->parent->next = NULL;
- while (dt) {
- dt->parent = parent;
- dt = dt->next;
+ int total = 0, width, len;
+ wchar_t c;
+
+ if (!CFG_TOYBOX_I18N) {
+ total = strlen(s);
+ if (toys.optflags & FLAG_q) for (; *s; s++) if (!isprint(*s)) *s = '?';
+ } else while (*s) {
+ len = mbrtowc(&c, s, MB_CUR_MAX, 0);
+ if (len < 1 || (width = wcwidth(c)) < 0) {
+ total++;
+ if (toys.optflags & FLAG_q) *s = '?';
+ s++;
+ } else {
+ s += len;
+ total += width;
}
}
+
+ return total;
}
static char endtype(struct stat *st)
static char *getusername(uid_t uid)
{
struct passwd *pw = getpwuid(uid);
- utoa_to_buf(uid, TT.uid_buf, 12);
+
+ sprintf(TT.uid_buf, "%u", (unsigned)uid);
return pw ? pw->pw_name : TT.uid_buf;
}
static char *getgroupname(gid_t gid)
{
struct group *gr = getgrgid(gid);
- return gr ? gr->gr_name : utoa(gid);
+
+ sprintf(TT.gid_buf, "%u", (unsigned)gid);
+ return gr ? gr->gr_name : TT.gid_buf;
+}
+
+static int numlen(long long ll)
+{
+ return snprintf(0, 0, "%llu", ll);
}
// Figure out size of printable entry fields for display indent/wrap
struct stat *st = &(dt->st);
unsigned flags = toys.optflags;
- *len = strlen(dt->name);
+ *len = strwidth(dt->name);
if (endtype(st)) ++*len;
if (flags & FLAG_m) ++*len;
- if (flags & FLAG_i) *len += (len[1] = numlen(st->st_ino));
+ len[1] = (flags & FLAG_i) ? numlen(st->st_ino) : 0;
if (flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) {
unsigned fn = flags & FLAG_n;
len[2] = numlen(st->st_nlink);
- len[3] = strlen(fn ? utoa(st->st_uid) : getusername(st->st_uid));
- len[4] = strlen(fn ? utoa(st->st_gid) : getgroupname(st->st_gid));
- len[5] = numlen(st->st_size);
+ len[3] = fn ? numlen(st->st_uid) : strwidth(getusername(st->st_uid));
+ len[4] = fn ? numlen(st->st_gid) : strwidth(getgroupname(st->st_gid));
+ if (S_ISBLK(st->st_mode) || S_ISCHR(st->st_mode)) {
+ // cheating slightly here: assuming minor is always 3 digits to avoid
+ // tracking another column
+ len[5] = numlen(major(st->st_rdev))+5;
+ } else len[5] = numlen(st->st_size);
}
- if (flags & FLAG_s) *len += (len[6] = numlen(st->st_blocks));
+
+ len[6] = (flags & FLAG_s) ? numlen(st->st_blocks) : 0;
+ len[7] = (flags & FLAG_Z) ? strwidth((char *)dt->extra) : 0;
}
static int compare(void *a, void *b)
return 0;
}
+ if (flags & FLAG_Z) {
+ if (!CFG_TOYBOX_LSM_NONE) {
+ int fd;
+
+ // Why not just openat(O_PATH|(O_NOFOLLOW*!!(toys.optflags&FLAG_L))) and
+ // lsm_fget_context() on that filehandle? Because the kernel is broken,
+ // and won't let us read this "metadata" from the filehandle unless we
+ // have permission to read the data. We _can_ read the same data in
+ // by path, we just can't do it through an O_PATH filehandle, because
+ // reasons. So as a bug workaround for the broken kernel, we do it
+ // both ways.
+ //
+ // The O_NONBLOCK is there to avoid triggering automounting (there's
+ // a rush of nostalgia for you) on directories we don't descend into,
+ // which O_PATH would have done for us but see "the kernel is broken".
+ if (S_ISSOCK(new->st.st_mode) ||
+ (S_ISLNK(new->st.st_mode) && !(toys.optflags & FLAG_L)) ||
+ -1 == (fd = openat(dirtree_parentfd(new), new->name,
+ O_RDONLY|O_NONBLOCK|O_NOATIME)))
+ {
+ char *path;
+
+ // Wouldn't it be nice if the lsm functions worked like openat(),
+ // fchmodat(), mknodat(), readlinkat() so we could do this without
+ // even O_PATH? But no, this is 1990's tech.
+ path = dirtree_path(new, 0);
+ lsm_lget_context(path, (char **)&new->extra);
+ free(path);
+ } else {
+ lsm_fget_context(fd, (char **)&new->extra);
+ close(fd);
+ }
+ }
+ if (CFG_TOYBOX_LSM_NONE || !new->extra) new->extra = (long)xstrdup("?");
+ }
+
if (flags & FLAG_u) new->st.st_mtime = new->st.st_atime;
if (flags & FLAG_c) new->st.st_mtime = new->st.st_ctime;
if (flags & FLAG_k) new->st.st_blocks = (new->st.st_blocks + 1) / 2;
return (*xpos*height) + widecols + (ul/(columns-1));
}
+int color_from_mode(mode_t mode)
+{
+ int color = 0;
+
+ if (S_ISDIR(mode)) color = 256+34;
+ else if (S_ISLNK(mode)) color = 256+36;
+ else if (S_ISBLK(mode) || S_ISCHR(mode)) color = 256+33;
+ else if (S_ISREG(mode) && (mode&0111)) color = 256+32;
+ else if (S_ISFIFO(mode)) color = 33;
+ else if (S_ISSOCK(mode)) color = 256+35;
+
+ return color;
+}
+
// Display a list of dirtree entries, according to current format
// Output types -1, -l, -C, or stream
static void listfiles(int dirfd, struct dirtree *indir)
{
- struct dirtree *dt, **sort = 0;
- unsigned long dtlen = 0, ul = 0;
- unsigned width, flags = toys.optflags, totals[7], len[7],
+ struct dirtree *dt, **sort;
+ unsigned long dtlen, ul = 0;
+ unsigned width, flags = toys.optflags, totals[8], len[8], totpad = 0,
*colsizes = (unsigned *)(toybuf+260), columns = (sizeof(toybuf)-260)/4;
memset(totals, 0, sizeof(totals));
- // Silently descend into single directory listed by itself on command line.
- // In this case only show dirname/total header when given -R.
+ // Top level directory was already populated by main()
if (!indir->parent) {
- if (!(dt = indir->child)) return;
- if (S_ISDIR(dt->st.st_mode) && !dt->next && !(flags & FLAG_d)) {
- dt->extra = 1;
- listfiles(open(dt->name, 0), dt);
+ // Silently descend into single directory listed by itself on command line.
+ // In this case only show dirname/total header when given -R.
+ dt = indir->child;
+ if (dt && S_ISDIR(dt->st.st_mode) && !dt->next && !(flags&(FLAG_d|FLAG_R)))
+ {
+ listfiles(open(dt->name, 0), TT.singledir = dt);
+
return;
}
+
+ // Do preprocessing (Dirtree didn't populate, so callback wasn't called.)
+ for (;dt; dt = dt->next) filter(dt);
+ if (flags == (FLAG_1|FLAG_f)) return;
} else {
// Read directory contents. We dup() the fd because this will close it.
+ // This reads/saves contents to display later, except for in "ls -1f" mode.
indir->data = dup(dirfd);
- dirtree_recurse(indir, filter, (flags&FLAG_L));
+ dirtree_recurse(indir, filter, DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
}
// Copy linked list to array and sort it. Directories go in array because
- // we visit them in sorted order.
-
- for (;;) {
- for (dt = indir->child; dt; dt = dt->next) {
+ // we visit them in sorted order too. (The nested loops let us measure and
+ // fill with the same inner loop.)
+ for (sort = 0;;sort = xmalloc(dtlen*sizeof(void *))) {
+ for (dtlen = 0, dt = indir->child; dt; dt = dt->next, dtlen++)
if (sort) sort[dtlen] = dt;
- dtlen++;
- }
- if (sort) break;
- sort = xmalloc(dtlen * sizeof(void *));
- dtlen = 0;
- continue;
+ if (sort || !dtlen) break;
}
// Label directory if not top of tree, or if -R
- if (indir->parent && (!indir->extra || (flags & FLAG_R)))
+ if (indir->parent && (TT.singledir!=indir || (flags&FLAG_R)))
{
char *path = dirtree_path(indir, 0);
free(path);
}
- if (!(flags & FLAG_f)) qsort(sort, dtlen, sizeof(void *), (void *)compare);
+ // Measure each entry to work out whitespace padding and total blocks
+ if (!(flags & FLAG_f)) {
+ unsigned long long blocks = 0;
+
+ qsort(sort, dtlen, sizeof(void *), (void *)compare);
+ for (ul = 0; ul<dtlen; ul++) {
+ entrylen(sort[ul], len);
+ for (width = 0; width<8; width++)
+ if (len[width]>totals[width]) totals[width] = len[width];
+ blocks += sort[ul]->st.st_blocks;
+ }
+ totpad = totals[1]+!!totals[1]+totals[6]+!!totals[6]+totals[7]+!!totals[7];
+ if ((flags&(FLAG_l|FLAG_o|FLAG_n|FLAG_g|FLAG_s)) && indir->parent)
+ xprintf("total %llu\n", blocks);
+ }
// Find largest entry in each field for display alignment
if (flags & (FLAG_C|FLAG_x)) {
memset(colsizes, 0, columns*sizeof(unsigned));
for (ul=0; ul<dtlen; ul++) {
entrylen(sort[next_column(ul, dtlen, columns, &c)], len);
+ *len += totpad;
if (c == columns) break;
- // Does this put us over budget?
+ // Expand this column if necessary, break if that puts us over budget
if (*len > colsizes[c]) {
- totlen += *len-colsizes[c];
+ totlen += (*len)-colsizes[c];
colsizes[c] = *len;
if (totlen > TT.screen_width) break;
}
}
- // If it fit, stop here
+ // If everything fit, stop here
if (ul == dtlen) break;
}
- } else if (flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g|FLAG_s)) {
- unsigned long blocks = 0;
-
- for (ul = 0; ul<dtlen; ul++)
- {
- entrylen(sort[ul], len);
- for (width=0; width<6; width++)
- if (len[width] > totals[width]) totals[width] = len[width];
- blocks += sort[ul]->st.st_blocks;
- }
-
- if (indir->parent) xprintf("total %lu\n", blocks);
}
// Loop through again to produce output.
memset(toybuf, ' ', 256);
width = 0;
for (ul = 0; ul<dtlen; ul++) {
- unsigned curcol;
+ unsigned curcol, color = 0;
unsigned long next = next_column(ul, dtlen, columns, &curcol);
struct stat *st = &(sort[next]->st);
mode_t mode = st->st_mode;
}
width += *len;
- if (flags & FLAG_i) xprintf("% *lu ", len[1], (unsigned long)st->st_ino);
- if (flags & FLAG_s) xprintf("% *lu ", len[6], (unsigned long)st->st_blocks);
+ if (flags & FLAG_i)
+ xprintf("%*lu ", totals[1], (unsigned long)st->st_ino);
+ if (flags & FLAG_s)
+ xprintf("%*lu ", totals[6], (unsigned long)st->st_blocks);
if (flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) {
struct tm *tm;
- char perm[11], thyme[64], c, d, *usr, *upad, *grp, *grpad;
- int i, bit;
-
- perm[10]=0;
- for (i=0; i<9; i++) {
- bit = mode & (1<<i);
- c = i%3;
- if (!c && (mode & (1<<((d=i/3)+9)))) {
- c = "tss"[d];
- if (!bit) c &= ~0x20;
- } else c = bit ? "xwr"[c] : '-';
- perm[9-i] = c;
- }
+ char perm[11], thyme[64], *ss;
- if (S_ISDIR(mode)) c = 'd';
- else if (S_ISBLK(mode)) c = 'b';
- else if (S_ISCHR(mode)) c = 'c';
- else if (S_ISLNK(mode)) c = 'l';
- else if (S_ISFIFO(mode)) c = 'p';
- else if (S_ISSOCK(mode)) c = 's';
- else c = '-';
- *perm = c;
+ // (long) is to coerce the st types into something we know we can print.
+ mode_to_string(mode, perm);
+ printf("%s% *ld", perm, totals[2]+1, (long)st->st_nlink);
- tm = localtime(&(st->st_mtime));
- strftime(thyme, sizeof(thyme), "%F %H:%M", tm);
-
- if (flags&FLAG_o) grp = grpad = toybuf+256;
- else {
- grp = (flags&FLAG_n) ? utoa(st->st_gid) : getgroupname(st->st_gid);
- grpad = toybuf+256-(totals[4]-len[4]);
+ // print user
+ if (!(flags&FLAG_g)) {
+ if (flags&FLAG_n) sprintf(ss = thyme, "%u", (unsigned)st->st_uid);
+ else strwidth(ss = getusername(st->st_uid));
+ printf(" %*s", (int)totals[3], ss);
}
- if (flags&FLAG_g) usr = upad = toybuf+256;
- else {
- upad = toybuf+255-(totals[3]-len[3]);
- if (flags&FLAG_n) {
- usr = TT.uid_buf;
- utoa_to_buf(st->st_uid, TT.uid_buf, 12);
- } else usr = getusername(st->st_uid);
+ // print group
+ if (!(flags&FLAG_o)) {
+ if (flags&FLAG_n) sprintf(ss = thyme, "%u", (unsigned)st->st_gid);
+ else strwidth(ss = getgroupname(st->st_gid));
+ printf(" %*s", (int)totals[4], ss);
}
- // Coerce the st types into something we know we can print.
- xprintf("%s% *ld %s%s%s%s% *"PRId64" %s ", perm, totals[2]+1,
- (long)st->st_nlink, usr, upad, grp, grpad, totals[5]+1,
- (int64_t)st->st_size, thyme);
+ if (flags & FLAG_Z)
+ printf(" %*s", -(int)totals[7], (char *)sort[next]->extra);
+
+ // print major/minor
+ if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode))
+ printf("% *d,% 4d", totals[5]-4, major(st->st_rdev),minor(st->st_rdev));
+ else printf("% *lld", totals[5]+1, (long long)st->st_size);
+
+ // print time, always in --time-style=long-iso
+ tm = localtime(&(st->st_mtime));
+ strftime(thyme, sizeof(thyme), "%F %H:%M", tm);
+ xprintf(" %s ", thyme);
+ } else if (flags & FLAG_Z)
+ printf("%*s ", (int)totals[7], (char *)sort[next]->extra);
+
+ if (flags & FLAG_color) {
+ color = color_from_mode(st->st_mode);
+ if (color) printf("\033[%d;%dm", color>>8, color&255);
}
if (flags & FLAG_q) {
char *p;
- for (p=sort[next]->name; *p; p++) xputc(isprint(*p) ? *p : '?');
+ for (p=sort[next]->name; *p; p++) fputc(isprint(*p) ? *p : '?', stdout);
} else xprintf("%s", sort[next]->name);
- if ((flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) && S_ISLNK(mode))
- xprintf(" -> %s", sort[next]->symlink);
+ if (color) xprintf("\033[0m");
+
+ if ((flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) && S_ISLNK(mode)) {
+ printf(" -> ");
+ if (flags & FLAG_color) {
+ struct stat st2;
+
+ if (fstatat(dirfd, sort[next]->symlink, &st2, 0)) color = 256+31;
+ else color = color_from_mode(st2.st_mode);
+
+ if (color) printf("\033[%d;%dm", color>>8, color&255);
+ }
+
+ printf("%s", sort[next]->symlink);
+ if (color) printf("\033[0m");
+ }
if (et) xputc(et);
// Pad columns
if (flags & (FLAG_C|FLAG_x)) {
- curcol = colsizes[curcol] - *len;
- if (curcol >= 0) xprintf("%s", toybuf+255-curcol);
+ curcol = colsizes[curcol]-(*len)-totpad;
+ if (curcol < 255) xprintf("%s", toybuf+255-curcol);
}
}
// Free directory entries, recursing first if necessary.
for (ul = 0; ul<dtlen; free(sort[ul++])) {
- if ((flags & FLAG_d) || !S_ISDIR(sort[ul]->st.st_mode)
- || !dirtree_notdotdot(sort[ul])) continue;
+ if ((flags & FLAG_d) || !S_ISDIR(sort[ul]->st.st_mode)) continue;
// Recurse into dirs if at top of the tree or given -R
- if (!indir->parent || (flags & FLAG_R))
+ if (!indir->parent || ((flags&FLAG_R) && dirtree_notdotdot(sort[ul])))
listfiles(openat(dirfd, sort[ul]->name, 0), sort[ul]);
+ free((void *)sort[ul]->extra);
}
free(sort);
- if (dirfd != AT_FDCWD) close(indir->data);
+ if (dirfd != AT_FDCWD) close(dirfd);
}
void ls_main(void)
char **s, *noargs[] = {".", 0};
struct dirtree *dt;
+ TT.screen_width = 80;
+ terminal_size(&TT.screen_width, NULL);
+ if (TT.screen_width<2) TT.screen_width = 2;
+
// Do we have an implied -1
- if (!isatty(1) || (toys.optflags&(FLAG_l|FLAG_o|FLAG_n|FLAG_g)))
+ if (!isatty(1)) {
toys.optflags |= FLAG_1;
- else {
- TT.screen_width = 80;
- terminal_size(&TT.screen_width, NULL);
- }
+ if (TT.color) toys.optflags ^= FLAG_color;
+ } else if (toys.optflags&(FLAG_l|FLAG_o|FLAG_n|FLAG_g))
+ toys.optflags |= FLAG_1;
+ else if (!(toys.optflags&(FLAG_1|FLAG_x|FLAG_m))) toys.optflags |= FLAG_C;
// The optflags parsing infrastructure should really do this for us,
// but currently it has "switch off when this is set", so "-dR" and "-Rd"
// behave differently
// Iterate through command line arguments, collecting directories and files.
// Non-absolute paths are relative to current directory.
- TT.files = dirtree_add_node(0, 0, 0);
+ TT.files = dirtree_start(0, 0);
for (s = *toys.optargs ? toys.optargs : noargs; *s; s++) {
- dt = dirtree_add_node(AT_FDCWD, *s,
- (toys.optflags & (FLAG_L|FLAG_H|FLAG_l))^FLAG_l);
-
- if (!dt) {
- toys.exitval = 1;
- continue;
- }
+ dt = dirtree_start(*s, !(toys.optflags&(FLAG_l|FLAG_d|FLAG_F)) ||
+ (toys.optflags&(FLAG_L|FLAG_H)));
- // Typecast means double_list->prev temporarirly goes in dirtree->parent
- dlist_add_nomalloc((struct double_list **)&TT.files->child,
- (struct double_list *)dt);
+ // note: double_list->prev temporarirly goes in dirtree->parent
+ if (dt) dlist_add_nomalloc((void *)&TT.files->child, (void *)dt);
+ else toys.exitval = 1;
}
- // Turn double_list into dirtree
- dlist_to_dirtree(TT.files);
+ // Convert double_list into dirtree.
+ dlist_terminate(TT.files->child);
+ for (dt = TT.files->child; dt; dt = dt->next) dt->parent = TT.files;
// Display the files we collected
listfiles(AT_FDCWD, TT.files);
OSDN Git Service
