From 5c4ac67899a4c75cfda7137436b6ce1885b36077 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 24 Apr 2012 05:48:03 -0500 Subject: Require -R to recurse, but descend into directories listed on command line. --- toys/ls.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'toys') diff --git a/toys/ls.c b/toys/ls.c index 65cad79e..ff7567eb 100644 --- a/toys/ls.c +++ b/toys/ls.c @@ -157,7 +157,8 @@ static void listfiles(struct dirtree *indir) int showdirs = 1; // Figure out if we should show directories and current directory name - if (indir == TT.files) showdirs = (flags & (FLAG_d|FLAG_R)); + if (indir == TT.files) + showdirs = (flags & (FLAG_d|FLAG_R)) || indir->parent; if (indir != TT.files || (indir->parent && (flags & FLAG_R))) { char *path = dirtree_path(indir, 0); @@ -272,7 +273,7 @@ static void listfiles(struct dirtree *indir) // TODO follow symlinks when? if (!S_ISDIR(sort[ul]->st.st_mode) || dirtree_isdotdot(sort[ul])) continue; - if (indir == TT.files || (flags & FLAG_R)) { + if (!indir->parent || (flags & FLAG_R)) { int fd = openat(indir->data, sort[ul]->name, 0); sort[ul]->data = dup(fd); -- cgit v1.2.3