diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-15 05:21:47 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-15 05:21:47 +0000 |
| commit | 51f1b6c0e0160a3c836bc6700c3fa2a43601dfac (patch) | |
| tree | 04ccdb962b5141ae35ba38f0f96b086d6fa2d6d4 /coreutils | |
| parent | 4b8171cd7ac73f9dfaf3873ee5a964e6801be9e4 (diff) | |
| download | busybox-51f1b6c0e0160a3c836bc6700c3fa2a43601dfac.tar.gz | |
ls: fix a bug where we may use uninintialized variable
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/ls.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index a76ced1b9..f4e71bc6a 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -837,7 +837,8 @@ int ls_main(int argc UNUSED_PARAM, char **argv) int dnfiles; int dndirs; int i; - USE_FEATURE_LS_COLOR(char *color_opt;) + /* need to initialize since --color has _an optional_ argument */ + USE_FEATURE_LS_COLOR(const char *color_opt = "always";) INIT_G(); @@ -888,15 +889,15 @@ int ls_main(int argc UNUSED_PARAM, char **argv) if (ENABLE_FEATURE_LS_COLOR_IS_DEFAULT && isatty(STDOUT_FILENO)) { char *p = getenv("LS_COLORS"); /* LS_COLORS is unset, or (not empty && not "none") ? */ - if (!p || (p[0] && strcmp(p, "none"))) + if (!p || (p[0] && strcmp(p, "none") != 0)) show_color = 1; } if (opt & (1 << i)) { /* next flag after short options */ - if (!color_opt || !strcmp("always", color_opt)) + if (strcmp("always", color_opt) == 0) show_color = 1; - else if (color_opt && !strcmp("never", color_opt)) + else if (strcmp("never", color_opt) == 0) show_color = 0; - else if (color_opt && !strcmp("auto", color_opt) && isatty(STDOUT_FILENO)) + else if (strcmp("auto", color_opt) == 0 && isatty(STDOUT_FILENO)) show_color = 1; } #endif |