aboutsummaryrefslogtreecommitdiff
path: root/toys/posix/ls.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-10-30 16:47:29 -0500
committerRob Landley <rob@landley.net>2014-10-30 16:47:29 -0500
commit82671e1ed5f06e016398f3d2de5f3c2ba388713d (patch)
tree853f33c7b9e657a4e8cd16689e595b529e751f75 /toys/posix/ls.c
parentbaa7f5cad548d8eceed45bebe4631f0e177bd8f0 (diff)
downloadtoybox-82671e1ed5f06e016398f3d2de5f3c2ba388713d.tar.gz
Test for ls -d from Isaac Dunham, and he pointed out -F also disables symlink following.
Diffstat (limited to 'toys/posix/ls.c')
-rw-r--r--toys/posix/ls.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/toys/posix/ls.c b/toys/posix/ls.c
index 37da4497..d1a26ee1 100644
--- a/toys/posix/ls.c
+++ b/toys/posix/ls.c
@@ -487,7 +487,7 @@ void ls_main(void)
// Non-absolute paths are relative to current directory.
TT.files = dirtree_add_node(0, 0, 0);
for (s = *toys.optargs ? toys.optargs : noargs; *s; s++) {
- dt = dirtree_add_node(0, *s, !(toys.optflags & (FLAG_l|FLAG_d))
+ dt = dirtree_add_node(0, *s, !(toys.optflags & (FLAG_l|FLAG_d|FLAG_F))
|| (toys.optflags & (FLAG_L|FLAG_H)));
if (!dt) {