From f51eb4a5cc9bb7ea2a9906fb4bc24faff0449b5e Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 1 Jun 1996 23:08:35 +0000 Subject: (decode_switches): Set print_with_color in one statement. --- src/ls.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') 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) { -- cgit v1.2.3-70-g09d2