From a559ffac8c65f469adefcd2d4a5c41790d7e6d05 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 15 Apr 2019 10:21:22 -0400 Subject: [WIP] bftw: Push all files onto the queue before visiting them --- eval.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'eval.c') diff --git a/eval.c b/eval.c index 341b289..3b054fa 100644 --- a/eval.c +++ b/eval.c @@ -1206,7 +1206,6 @@ static const char *dump_bftw_visit(enum bftw_visit visit) { static const char *dump_bftw_action(enum bftw_action action) { static const char *actions[] = { DUMP_BFTW_MAP(BFTW_CONTINUE), - DUMP_BFTW_MAP(BFTW_SKIP_SIBLINGS), DUMP_BFTW_MAP(BFTW_SKIP_SUBTREE), DUMP_BFTW_MAP(BFTW_STOP), }; @@ -1273,11 +1272,8 @@ static enum bftw_action cmdline_callback(struct BFTW *ftwbuf, void *ptr) { state.action = BFTW_SKIP_SUBTREE; } - // In -depth mode, only handle directories on the BFTW_POST visit enum bftw_visit expected_visit = BFTW_PRE; - if ((cmdline->flags & BFTW_DEPTH) - && ftwbuf->typeflag == BFTW_DIR - && ftwbuf->depth < cmdline->maxdepth) { + if ((cmdline->flags & BFTW_DEPTH) && ftwbuf->depth < cmdline->maxdepth) { expected_visit = BFTW_POST; } -- cgit v1.2.3