diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-04 10:25:44 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-04 10:25:44 +0000 |
commit | 671691cf2107b846b40c165e6d5b2806172b6030 (patch) | |
tree | 0a2210ed36cb41846d0bacd1b08777ddf7e6ec95 /libbb/recursive_action.c | |
parent | 8ae5b28b4bff5f1099a4a77af89e1a7e23ad77e2 (diff) | |
download | busybox-w32-671691cf2107b846b40c165e6d5b2806172b6030.tar.gz busybox-w32-671691cf2107b846b40c165e6d5b2806172b6030.tar.bz2 busybox-w32-671691cf2107b846b40c165e6d5b2806172b6030.zip |
modutils: optional modutils-small by Vladimir Dronnikov.
15kb smaller than standard one.
libbb/recursive_action.c: commented-out code for aborting the scan.
Diffstat (limited to 'libbb/recursive_action.c')
-rw-r--r-- | libbb/recursive_action.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index 9b6951f43..66bf6aa62 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c | |||
@@ -111,16 +111,23 @@ 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;*/ | ||
114 | char *nextFile; | 115 | char *nextFile; |
115 | 116 | ||
116 | nextFile = concat_subpath_file(fileName, next->d_name); | 117 | nextFile = concat_subpath_file(fileName, next->d_name); |
117 | if (nextFile == NULL) | 118 | if (nextFile == NULL) |
118 | continue; | 119 | continue; |
119 | /* process every file (NB: ACTION_RECURSE is set in flags) */ | 120 | /* process every file (NB: ACTION_RECURSE is set in flags) */ |
120 | if (!recursive_action(nextFile, flags, fileAction, dirAction, | 121 | /*s =*/ recursive_action(nextFile, flags, fileAction, dirAction, |
121 | userData, depth + 1)) | 122 | userData, depth + 1); |
122 | status = FALSE; | ||
123 | free(nextFile); | 123 | free(nextFile); |
124 | //#define RECURSE_RESULT_ABORT 3 | ||
125 | // if (s == RECURSE_RESULT_ABORT) { | ||
126 | // closedir(dir); | ||
127 | // return s; | ||
128 | // } | ||
129 | // if (s == FALSE) | ||
130 | // status = FALSE; | ||
124 | } | 131 | } |
125 | closedir(dir); | 132 | closedir(dir); |
126 | 133 | ||