a8a3b497f
Denis Vlasenko
2008-07-04
Subject
libbb/recursive_action.c: fix slight error in prev commit
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
libbb/recursive_action.c+5 -3
| @@ -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) { | |