# HG changeset patch # User Rob Landley # Date 1346978980 18000 # Node ID 60cbc87c431492d236d08d02d9c451ebcf4b1ad8 # Parent 5cb41d56f9d3e227b1a3ac83ad10a33d65002b63 I screwed up ls in commit 580. Oops. Fix it. diff -r 5cb41d56f9d3 -r 60cbc87c4314 toys/posix/ls.c --- a/toys/posix/ls.c Thu Sep 06 03:10:18 2012 -0500 +++ b/toys/posix/ls.c Thu Sep 06 19:49:40 2012 -0500 @@ -186,15 +186,14 @@ return 0; } - if (!(flags&FLAG_f)) { - if (flags & FLAG_a) return 0; - if (!(flags & FLAG_A) && new->name[0]=='.') return 0; - } - if (flags & FLAG_u) new->st.st_mtime = new->st.st_atime; if (flags & FLAG_c) new->st.st_mtime = new->st.st_ctime; if (flags & FLAG_k) new->st.st_blocks = (new->st.st_blocks + 1) / 2; - return dirtree_notdotdot(new); + + if (flags & (FLAG_a|FLAG_f)) return DIRTREE_SAVE; + if (!(flags & FLAG_A) && new->name[0]=='.') return 0; + + return dirtree_notdotdot(new) & DIRTREE_SAVE; } // For column view, calculate horizontal position (for padding) and return