diff options
author | Glenn L McGrath <bug1@ihug.co.nz> | 2003-05-26 14:07:50 +0000 |
---|---|---|
committer | Glenn L McGrath <bug1@ihug.co.nz> | 2003-05-26 14:07:50 +0000 |
commit | 393183dccc4d100366972bdbbdc6e03a77839120 (patch) | |
tree | d2e94dac0f1f5da5cb3ecb927b78c4c2a02f4ea6 /libbb/recursive_action.c | |
parent | ddfe18df75c15be4a2aadddb241c3b86b1e2968a (diff) | |
download | busybox-w32-393183dccc4d100366972bdbbdc6e03a77839120.tar.gz busybox-w32-393183dccc4d100366972bdbbdc6e03a77839120.tar.bz2 busybox-w32-393183dccc4d100366972bdbbdc6e03a77839120.zip |
Vodz, last_patch_86
Diffstat (limited to 'libbb/recursive_action.c')
-rw-r--r-- | libbb/recursive_action.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libbb/recursive_action.c b/libbb/recursive_action.c index a4a4a7be3..3ea107ca9 100644 --- a/libbb/recursive_action.c +++ b/libbb/recursive_action.c | |||
@@ -103,11 +103,9 @@ int recursive_action(const char *fileName, | |||
103 | while ((next = readdir(dir)) != NULL) { | 103 | while ((next = readdir(dir)) != NULL) { |
104 | char *nextFile; | 104 | char *nextFile; |
105 | 105 | ||
106 | if ((strcmp(next->d_name, "..") == 0) | 106 | nextFile = concat_subpath_file(fileName, next->d_name); |
107 | || (strcmp(next->d_name, ".") == 0)) { | 107 | if(nextFile == NULL) |
108 | continue; | 108 | continue; |
109 | } | ||
110 | nextFile = concat_path_file(fileName, next->d_name); | ||
111 | if (! recursive_action(nextFile, TRUE, followLinks, depthFirst, | 109 | if (! recursive_action(nextFile, TRUE, followLinks, depthFirst, |
112 | fileAction, dirAction, userData)) { | 110 | fileAction, dirAction, userData)) { |
113 | status = FALSE; | 111 | status = FALSE; |