svn commit: trunk/busybox/libbb

[vda at busybox.net]

Author: vda
Date: 2008-07-04 03:29:30 -0700 (Fri, 04 Jul 2008)
New Revision: 22627

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



Modified:
   trunk/busybox/libbb/recursive_action.c


Changeset:
Modified: trunk/busybox/libbb/recursive_action.c
===================================================================
--- trunk/busybox/libbb/recursive_action.c	2008-07-04 10:25:44 UTC (rev 22626)
+++ trunk/busybox/libbb/recursive_action.c	2008-07-04 10:29:30 UTC (rev 22627)
@@ -111,15 +111,17 @@
 	}
 	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) {