From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Fri, 4 Jul 2008 10:29:30 +0000 (-0000)
Subject: libbb/recursive_action.c: fix slight error in prev commit
X-Git-Tag: 1_12_0~247
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8;p=oweals%2Fbusybox.git

libbb/recursive_action.c: fix slight error in prev commit
---

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) {