aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libbb/recursive_action.c8
1 files 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,
111 } 111 }
112 status = TRUE; 112 status = TRUE;
113 while ((next = readdir(dir)) != NULL) { 113 while ((next = readdir(dir)) != NULL) {
114 /*int s;*/
115 char *nextFile; 114 char *nextFile;
116 115
117 nextFile = concat_subpath_file(fileName, next->d_name); 116 nextFile = concat_subpath_file(fileName, next->d_name);
118 if (nextFile == NULL) 117 if (nextFile == NULL)
119 continue; 118 continue;
120 /* process every file (NB: ACTION_RECURSE is set in flags) */ 119 /* process every file (NB: ACTION_RECURSE is set in flags) */
121 /*s =*/ recursive_action(nextFile, flags, fileAction, dirAction, 120 if (!recursive_action(nextFile, flags, fileAction, dirAction,
122 userData, depth + 1); 121 userData, depth + 1))
122 status = FALSE;
123// s = recursive_action(nextFile, flags, fileAction, dirAction,
124// userData, depth + 1);
123 free(nextFile); 125 free(nextFile);
124//#define RECURSE_RESULT_ABORT 3 126//#define RECURSE_RESULT_ABORT 3
125// if (s == RECURSE_RESULT_ABORT) { 127// if (s == RECURSE_RESULT_ABORT) {