summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2009-07-03 10:22:19 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2009-07-03 10:22:19 (GMT)
commitae05dd42ca809d81f7025d29701d4641f1a996bf (patch)
treec1755f25015c5a9aeaf99c7d9a412f0d07109fbd
parent5508363fd05ecf71bc1db887256da1c0ae960c8d (diff)
downloadbusybox-ae05dd42ca809d81f7025d29701d4641f1a996bf.tar.gz
busybox-ae05dd42ca809d81f7025d29701d4641f1a996bf.tar.bz2
ls: make --color more compatible with coreutils
function old new delta static.color_str - 34 +34 static.ls_longopts - 9 +9 ls_color_opt 9 - -9 ls_main 865 843 -22 ------------------------------------------------------------------------------ (add/remove: 2/1 grow/shrink: 0/1 up/down: 43/-31) Total: 12 bytes text data bss dec hex filename 820145 450 7692 828287 ca37f busybox_old 820144 450 7692 828286 ca37e busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--coreutils/ls.c54
1 files changed, 34 insertions, 20 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c
index db42601..8a6faf2 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -898,16 +898,6 @@ static int list_single(const struct dnode *dn)
}
-/* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
-#if ENABLE_FEATURE_LS_COLOR
-/* long option entry used only for --color, which has no short option
- * equivalent */
-static const char ls_color_opt[] ALIGN1 =
- "color\0" Optional_argument "\xff" /* no short equivalent */
- ;
-#endif
-
-
int ls_main(int argc UNUSED_PARAM, char **argv)
{
struct dnode **dnd;
@@ -920,8 +910,25 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
int dnfiles;
int dndirs;
int i;
+#if ENABLE_FEATURE_LS_COLOR
+ /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */
+ /* coreutils 6.10:
+ * # ls --color=BOGUS
+ * ls: invalid argument 'BOGUS' for '--color'
+ * Valid arguments are:
+ * 'always', 'yes', 'force'
+ * 'never', 'no', 'none'
+ * 'auto', 'tty', 'if-tty'
+ * (and substrings: "--color=alwa" work too)
+ */
+ static const char ls_longopts[] ALIGN1 =
+ "color\0" Optional_argument "\xff"; /* no short equivalent */
+ static const char color_str[] ALIGN1 =
+ "always\0""yes\0""force\0"
+ "auto\0""tty\0""if-tty\0";
/* need to initialize since --color has _an optional_ argument */
- IF_FEATURE_LS_COLOR(const char *color_opt = "always";)
+ const char *color_opt = color_str; /* "always" */
+#endif
INIT_G();
@@ -929,14 +936,14 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
(ENABLE_FEATURE_LS_SORTFILES * (SORT_NAME | SORT_FORWARD));
#if ENABLE_FEATURE_AUTOWIDTH
- /* Obtain the terminal width */
+ /* obtain the terminal width */
get_terminal_width_height(STDIN_FILENO, &terminal_width, NULL);
- /* Go one less... */
+ /* go one less... */
terminal_width--;
#endif
/* process options */
- IF_FEATURE_LS_COLOR(applet_long_options = ls_color_opt;)
+ IF_FEATURE_LS_COLOR(applet_long_options = ls_longopts;)
#if ENABLE_FEATURE_AUTOWIDTH
opt_complementary = "T+:w+"; /* -T N, -w N */
opt = getopt32(argv, ls_options, &tabstops, &terminal_width
@@ -975,13 +982,20 @@ int ls_main(int argc UNUSED_PARAM, char **argv)
if (!p || (p[0] && strcmp(p, "none") != 0))
show_color = 1;
}
- if (opt & OPT_color) { /* next flag after short options */
- if (strcmp("always", color_opt) == 0)
- show_color = 1;
- else if (strcmp("never", color_opt) == 0)
+ if (opt & OPT_color) {
+ if (color_opt[0] == 'n')
show_color = 0;
- else if (strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO))
- show_color = 1;
+ else switch (index_in_substrings(color_str, color_opt)) {
+ case 3:
+ case 4:
+ case 5:
+ if (isatty(STDOUT_FILENO)) {
+ case 0:
+ case 1:
+ case 2:
+ show_color = 1;
+ }
+ }
}
#endif