From 382057f588fbf2c2f7950b85dd317721b8d04c07 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Mon, 21 Nov 2016 16:47:23 -0600 Subject: Have dirtree_notdotdot() pass through !node->parent so . and .. on the command line aren't filtered out. Audited all the callers and removed redundant calls, adjusted call sequence, etc. (And let rm _not_ do this, because posix.) --- toys/other/modinfo.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'toys/other/modinfo.c') diff --git a/toys/other/modinfo.c b/toys/other/modinfo.c index 61155b46..69cdf27e 100644 --- a/toys/other/modinfo.c +++ b/toys/other/modinfo.c @@ -74,6 +74,8 @@ static void modinfo_file(char *full_name) static int check_module(struct dirtree *new) { + if (!dirtree_notdotdot(new)) return 0; + if (S_ISREG(new->st.st_mode)) { char *s; @@ -88,14 +90,14 @@ static int check_module(struct dirtree *new) } if (s[len] || strcmp(new->name+len, ".ko")) break; - modinfo_file(s = dirtree_path(new, NULL)); + modinfo_file(s = dirtree_path(new, 0)); free(s); return DIRTREE_ABORT; } } - return dirtree_notdotdot(new); + return DIRTREE_RECURSE; } void modinfo_main(void) -- cgit v1.2.3