From 82671e1ed5f06e016398f3d2de5f3c2ba388713d Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Thu, 30 Oct 2014 16:47:29 -0500 Subject: Test for ls -d from Isaac Dunham, and he pointed out -F also disables symlink following. --- toys/posix/ls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toys/posix/ls.c') 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) { -- cgit v1.2.3