diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-04 10:29:30 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-04 10:29:30 +0000 |
| commit | a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8 (patch) | |
| tree | 32c685199ea0010dc2e4681278f6ba07512acf75 /libbb/recursive_action.c | |
| parent | 671691cf2107b846b40c165e6d5b2806172b6030 (diff) | |
| download | busybox-w32-a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8.tar.gz busybox-w32-a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8.tar.bz2 busybox-w32-a8a3b497fc05cf4a8545acd1cbd75f1ad2ab97c8.zip | |
libbb/recursive_action.c: fix slight error in prev commit
Diffstat (limited to 'libbb/recursive_action.c')
| -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 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) { |