*
* See http://opengroup.org/onlinepubs/9699919799/utilities/ls.html
-USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"ZgoACFHLRSacdfiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]", TOYFLAG_BIN|TOYFLAG_LOCALE))
+USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"ZgoACFHLRSabcdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE))
config LS
bool "ls"
default y
help
- usage: ls [-ACFHLRSZacdfiklmnpqrstux1] [directory...]
+ usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [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 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
+ -a all files including .hidden -b escape nongraphic chars
+ -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)
- -m comma separated -n like -l but numeric uid/gid
- -o like -l but no group -x columns (horizontal sort)
+ -1 list one file per line -C columns (sorted vertically)
+ -g like -l but no owner -h human readable sizes
+ -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"
unsigned screen_width;
int nl_title;
- char uid_buf[12], gid_buf[12];
+ char *escmore;
)
-// Does two things: 1) Returns wcwidth(utf8) version of strlen,
-// 2) replaces unprintable characters input string with '?' wildcard char.
-int strwidth(char *s)
+// Callback from crunch_str to represent unprintable chars
+int crunch_qb(FILE *out, int cols, int wc)
{
- 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;
+ unsigned len = 1;
+ char buf[32];
+
+ if (toys.optflags&FLAG_q) *buf = '?';
+ else {
+ if (wc<256) *buf = wc;
+ // scrute the inscrutable, eff the ineffable, print the unprintable
+ else len = wcrtomb(buf, wc, 0);
+ if (toys.optflags&FLAG_b) {
+ char *to = buf, *from = buf+24;
+ int i, j;
+
+ memcpy(from, to, 8);
+ for (i = 0; i<len; i++) {
+ *to++ = '\\';
+ if (strchr(TT.escmore, from[i])) *to++ = from[i];
+ else if (-1 != (j = stridx("\\\a\b\033\f\n\r\t\v", from[i])))
+ *to++ = "\\abefnrtv"[j];
+ else to += sprintf(to, "%03o", from[i]);
+ }
+ len = to-buf;
}
}
- return total;
+ if (cols<len) len = cols;
+ if (out) fwrite(buf, len, 1, out);
+
+ return len;
+}
+
+// Returns wcwidth(utf8) version of strlen with -qb escapes
+int strwidth(char *s)
+{
+ return crunch_str(&s, INT_MAX, 0, TT.escmore, crunch_qb);
}
+void qbstr(char *s, int width)
+{
+ draw_trim_esc(s, width, abs(width), TT.escmore, crunch_qb);
+}
+
static char endtype(struct stat *st)
{
mode_t mode = st->st_mode;
return 0;
}
-static char *getusername(uid_t uid)
-{
- struct passwd *pw = getpwuid(uid);
-
- 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);
-
- 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);
{
struct stat *st = &(dt->st);
unsigned flags = toys.optflags;
+ char tmp[64];
*len = strwidth(dt->name);
if (endtype(st)) ++*len;
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;
+ len[5] = numlen(dev_major(st->st_rdev))+5;
+ } else if (flags & FLAG_h) {
+ human_readable(tmp, st->st_size, 0);
+ len[5] = strwidth(tmp);
} else len[5] = numlen(st->st_size);
}
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);
+
+ // (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.)
+ int fd = openat(dirtree_parentfd(new), new->name,
+ O_PATH|(O_NOFOLLOW*!(toys.optflags&FLAG_L)));
+
+ if (fd != -1) {
+ if (-1 == lsm_fget_context(fd, (char **)&new->extra) && errno == EBADF)
+ {
+ char hack[32];
+
+ // Work around kernel bug that won't let us read this "metadata" from
+ // the filehandle unless we have permission to read the data. (We can
+ // query the same data in by path, but can't do it through an O_PATH
+ // filehandle, because reasons. But for some reason, THIS is ok? If
+ // they ever fix the kernel, this should stop triggering.)
+
+ sprintf(hack, "/proc/self/fd/%d", fd);
+ lsm_lget_context(hack, (char **)&new->extra);
+ }
close(fd);
}
}
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;
+ char tmp[64];
+
+ if (-1 == dirfd) {
+ perror_msg_raw(indir->name);
+
+ return;
+ }
memset(totals, 0, sizeof(totals));
+ if (CFG_TOYBOX_ON_ANDROID || CFG_TOYBOX_DEBUG) memset(len, 0, sizeof(len));
// Top level directory was already populated by main()
if (!indir->parent) {
// 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 (S_ISDIR(dt->st.st_mode) && !dt->next && !(flags&(FLAG_d|FLAG_R))) {
+ 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, DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
- }
+ // 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.
+ } else dirtree_recurse(indir, filter, dup(dirfd),
+ DIRTREE_SYMFOLLOW*!!(flags&FLAG_L));
// Copy linked list to array and sort it. Directories go in array because
// we visit them in sorted order too. (The nested loops let us measure and
for (sort = 0;;sort = xmalloc(dtlen*sizeof(void *))) {
for (dtlen = 0, dt = indir->child; dt; dt = dt->next, dtlen++)
if (sort) sort[dtlen] = dt;
- if (sort) break;
+ if (sort || !dtlen) break;
}
// Label directory if not top of tree, or if -R
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);
+ if ((flags&(FLAG_h|FLAG_l|FLAG_o|FLAG_n|FLAG_g|FLAG_s)) && indir->parent) {
+ if (flags&FLAG_h) {
+ human_readable(tmp, blocks*512, 0);
+ xprintf("total %s\n", tmp);
+ } else xprintf("total %llu\n", blocks);
+ }
}
// Find largest entry in each field for display alignment
memset(toybuf, ' ', 256);
width = 0;
for (ul = 0; ul<dtlen; ul++) {
+ int ii;
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;
- char et = endtype(st);
+ char et = endtype(st), *ss;
// Skip directories at the top of the tree when -d isn't set
if (S_ISDIR(mode) && !indir->parent && !(flags & FLAG_d)) continue;
if (flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) {
struct tm *tm;
- char perm[11], thyme[64], *usr, *upad, *grp, *grpad;
- mode_to_string(mode, perm);
-
- if (flags&FLAG_o) grp = grpad = toybuf+256;
- else {
- if (flags&FLAG_n) sprintf(grp = thyme, "%u", (unsigned)st->st_gid);
- else strwidth(grp = getgroupname(st->st_gid));
- grpad = toybuf+256-(totals[4]-len[4]);
+ // (long) is to coerce the st types into something we know we can print.
+ mode_to_string(mode, tmp);
+ printf("%s% *ld", tmp, totals[2]+1, (long)st->st_nlink);
+
+ // print user
+ if (!(flags&FLAG_g)) {
+ putchar(' ');
+ ii = -totals[3];
+ if (flags&FLAG_n) printf("%*u", ii, (unsigned)st->st_uid);
+ else draw_trim_esc(getusername(st->st_uid), ii, abs(ii), TT.escmore,
+ crunch_qb);
}
- if (flags&FLAG_g) usr = upad = toybuf+256;
- else {
- upad = toybuf+255-(totals[3]-len[3]);
- if (flags&FLAG_n) sprintf(usr = TT.uid_buf, "%u", (unsigned)st->st_uid);
- else strwidth(usr = getusername(st->st_uid));
+ // print group
+ if (!(flags&FLAG_o)) {
+ putchar(' ');
+ ii = -totals[4];
+ if (flags&FLAG_n) printf("%*u", ii, (unsigned)st->st_gid);
+ else draw_trim_esc(getgroupname(st->st_gid), ii, abs(ii), TT.escmore,
+ crunch_qb);
}
- // Coerce the st types into something we know we can print.
- printf("%s% *ld %s%s%s%s", perm, totals[2]+1, (long)st->st_nlink,
- usr, upad, grp, grpad);
-
if (flags & FLAG_Z)
- printf(" %*s ", -(int)totals[7], (char *)sort[next]->extra);
+ printf(" %-*s", -(int)totals[7], (char *)sort[next]->extra);
+ // print major/minor, or size
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);
-
+ printf("% *d,% 4d", totals[5]-4, dev_major(st->st_rdev),
+ dev_minor(st->st_rdev));
+ else if (flags&FLAG_h) {
+ human_readable(tmp, st->st_size, 0);
+ xprintf("%*s", totals[5]+1, tmp);
+ } 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);
+ strftime(tmp, sizeof(tmp), "%F %H:%M", tm);
+ xprintf(" %s ", tmp);
} else if (flags & FLAG_Z)
- printf("%*s ", (int)totals[7], (char *)sort[next]->extra);
+ 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++) fputc(isprint(*p) ? *p : '?', stdout);
- } else xprintf("%s", sort[next]->name);
+ ss = sort[next]->name;
+ crunch_str(&ss, INT_MAX, stdout, TT.escmore, crunch_qb);
if (color) xprintf("\033[0m");
if ((flags & (FLAG_l|FLAG_o|FLAG_n|FLAG_g)) && S_ISLNK(mode)) {
TT.screen_width = 80;
terminal_size(&TT.screen_width, NULL);
if (TT.screen_width<2) TT.screen_width = 2;
+ if (toys.optflags&FLAG_b) TT.escmore = " \\";
// Do we have an implied -1
if (!isatty(1)) {
- toys.optflags |= FLAG_1;
+ if (!(toys.optflags & FLAG_m)) toys.optflags |= FLAG_1;
if (TT.color) toys.optflags ^= FLAG_color;
} else if (toys.optflags&(FLAG_l|FLAG_o|FLAG_n|FLAG_g))
toys.optflags |= FLAG_1;
if (toys.optflags & FLAG_d) toys.optflags &= ~FLAG_R;
// Iterate through command line arguments, collecting directories and files.
- // Non-absolute paths are relative to current directory.
- TT.files = dirtree_start(0, 0);
+ // Non-absolute paths are relative to current directory. Top of tree is
+ // a dummy node to collect command line arguments into pseudo-directory.
+ TT.files = dirtree_add_node(0, 0, 0);
+ TT.files->dirfd = AT_FDCWD;
for (s = *toys.optargs ? toys.optargs : noargs; *s; s++) {
- dt = dirtree_start(*s, !(toys.optflags&(FLAG_l|FLAG_d|FLAG_F)) ||
- (toys.optflags&(FLAG_L|FLAG_H)));
+ int sym = !(toys.optflags&(FLAG_l|FLAG_d|FLAG_F))
+ || (toys.optflags&(FLAG_L|FLAG_H));
+
+ dt = dirtree_add_node(0, *s, DIRTREE_SYMFOLLOW*sym);
// note: double_list->prev temporarirly goes in dirtree->parent
if (dt) dlist_add_nomalloc((void *)&TT.files->child, (void *)dt);
OSDN Git Service
