diff options
Diffstat (limited to 'coreutils/ls.c')
-rw-r--r-- | coreutils/ls.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coreutils/ls.c b/coreutils/ls.c index 19c868ca4..847fdec07 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c | |||
@@ -1,6 +1,5 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | 1 | /* vi: set sw=4 ts=4: */ |
2 | /* | 2 | /* |
3 | * tiny-ls.c version 0.1.0: A minimalist 'ls' | ||
4 | * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com> | 3 | * Copyright (C) 1996 Brian Candler <B.Candler@pobox.com> |
5 | * | 4 | * |
6 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 5 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
@@ -1145,7 +1144,10 @@ int ls_main(int argc UNUSED_PARAM, char **argv) | |||
1145 | do { | 1144 | do { |
1146 | cur = my_stat(*argv, *argv, | 1145 | cur = my_stat(*argv, *argv, |
1147 | /* follow links on command line unless -l, -s or -F: */ | 1146 | /* follow links on command line unless -l, -s or -F: */ |
1148 | !((all_fmt & (STYLE_LONG|LIST_BLOCKS)) || (option_mask32 & OPT_F)) | 1147 | !((all_fmt & STYLE_MASK) == STYLE_LONG |
1148 | || (all_fmt & LIST_BLOCKS) | ||
1149 | || (option_mask32 & OPT_F) | ||
1150 | ) | ||
1149 | /* ... or if -H: */ | 1151 | /* ... or if -H: */ |
1150 | || (option_mask32 & OPT_H) | 1152 | || (option_mask32 & OPT_H) |
1151 | ); | 1153 | ); |