summaryrefslogtreecommitdiff
path: root/src/ls.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ls.c')
-rw-r--r--src/ls.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ls.c b/src/ls.c
index 2d54c3fb0..180ca8ba4 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1070,10 +1070,9 @@ decode_switches (int argc, char **argv)
i = color_always;
}
- if (i == color_if_tty)
- print_with_color = isatty (STDOUT_FILENO);
- else
- print_with_color = (i == color_always);
+ print_with_color = (i == color_always
+ || (i == color_if_tty
+ && isatty (STDOUT_FILENO)));
if (print_with_color)
{