ea684c6aa
Denys Vlasenko
2011-03-12
Subject
ls: fix handling of symlinks by option -1
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/ls.c+4 -2
| @@ -1,6 +1,5 @@ | |
| /* vi: set sw=4 ts=4: */ | |
| /* | |
| - | * tiny-ls.c version 0.1.0: A minimalist 'ls' |
| * Copyright (C) 1996 Brian Candler <[email protected]> | |
| * | |
| * 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) | |
| do { | |
| cur = my_stat(*argv, *argv, | |
| /* follow links on command line unless -l, -s or -F: */ | |
| - | !((all_fmt & (STYLE_LONG|LIST_BLOCKS)) || (option_mask32 & OPT_F)) |
| + | !((all_fmt & STYLE_MASK) == STYLE_LONG |
| + | || (all_fmt & LIST_BLOCKS) |
| + | || (option_mask32 & OPT_F) |
| + | ) |
| /* ... or if -H: */ | |
| || (option_mask32 & OPT_H) | |
| ); | |
testsuite/ls.tests+10 -0
| @@ -251,6 +251,16 @@ test x"$CONFIG_UNICODE_SUPPORT" = x"y" \ | |
| 0110_5.3.2__U+FFFF_=_ef_bf_bf_=_"?"_______________________________________| | |
| ' "" "" | |
| + | rm -rf ls.testdir 2>/dev/null |
| + | mkdir ls.testdir || exit 1 |
| + | |
| + | # testing "test name" "command" "expected result" "file input" "stdin" |
| + | |
| + | testing "ls symlink_to_dir" \ |
| + | "touch ls.testdir/A ls.testdir/B; ln -s ls.testdir ls.link; ls ls.link; ls -1 ls.link/; ls -1 ls.link; rm -f ls.link" \ |
| + | "A\nB\nA\nB\nA\nB\n" \ |
| + | "" "" |
| + | |
| # Clean up | |
| rm -rf ls.testdir 2>/dev/null | |