From 1aaef2d2b72800a5c6bedae04941304ce8e153be Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 26 Aug 2018 13:23:10 -0500 Subject: Remove ls sub-option: always support --color. (Well, when you say --color or "alias ls='ls --color=auto'" in your shell.) --- toys/posix/ls.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/toys/posix/ls.c b/toys/posix/ls.c index 2726630c..ec8c6c0d 100644 --- a/toys/posix/ls.c +++ b/toys/posix/ls.c @@ -12,13 +12,13 @@ * Posix says the -l date format should vary based on how recent it is * and we do --time-style=long-iso instead -USE_LS(NEWTOY(ls, USE_LS_COLOR("(color):;")"(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) +USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE)) config LS bool "ls" default y help - usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [directory...] + usage: ls [-ACFHLRSZacdfhiklmnpqrstux1] [--color[=auto]] [directory...] list files @@ -38,20 +38,12 @@ config LS -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) -ll long with nanoseconds (--full-time) - - sorting (default is alphabetical): - -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. + + sorting (default is alphabetical): + -f unsorted -r reverse -t timestamp -S size */ #define FOR_ls -- cgit v1.2.3