From a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Fri, 4 Jul 2008 10:29:30 +0000 Subject: [PATCH] libbb/recursive_action.c: fix slight error in prev commit --- libbb/recursive_action.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 66bf6aa62..dbc31c3b6 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c @@ -111,15 +111,17 @@ int FAST_FUNC recursive_action(const char *fileName, } status = TRUE; while ((next = readdir(dir)) != NULL) { - /*int s;*/ char *nextFile; nextFile = concat_subpath_file(fileName, next->d_name); if (nextFile == NULL) continue; /* process every file (NB: ACTION_RECURSE is set in flags) */ - /*s =*/ recursive_action(nextFile, flags, fileAction, dirAction, - userData, depth + 1); + if (!recursive_action(nextFile, flags, fileAction, dirAction, + userData, depth + 1)) + status = FALSE; +// s = recursive_action(nextFile, flags, fileAction, dirAction, +// userData, depth + 1); free(nextFile); //#define RECURSE_RESULT_ABORT 3 // if (s == RECURSE_RESULT_ABORT) {