diff options
| author | Denis Vlasenko | 2008-07-04 10:29:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-07-04 10:29:30 +0000 |
| commit | a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8 (patch) | |
| tree | 32c685199ea0010dc2e4681278f6ba07512acf75 | |
| parent | 671691cf2107b846b40c165e6d5b2806172b6030 (diff) | |
| download | busybox-a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8.zip busybox-a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8.tar.gz | |
libbb/recursive_action.c: fix slight error in prev commit
| -rw-r--r-- | libbb/recursive_action.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 66bf6aa..dbc31c3 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) { |