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/posix/rm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toys/posix/rm.c') diff --git a/toys/posix/rm.c b/toys/posix/rm.c index 99fa8edf..2f99c326 100644 --- a/toys/posix/rm.c +++ b/toys/posix/rm.c @@ -28,7 +28,7 @@ static int do_rm(struct dirtree *try) int dir = S_ISDIR(try->st.st_mode), or = 0, using = 0; // Skip . and .. (yes, even explicitly on the command line: posix says to) - if (!dirtree_notdotdot(try)) return 0; + if (isdotdot(try->name)) return 0; // Intentionally fail non-recursive attempts to remove even an empty dir // (via wrong flags to unlinkat) because POSIX says to. -- cgit v1.2.3