aboutsummaryrefslogtreecommitdiff
path: root/libbb/recursive_action.c
diff options
context:
space:
mode:
authorbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-05-26 14:07:50 +0000
committerbug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277>2003-05-26 14:07:50 +0000
commit76f4ab68a56e14747c25e6da830cf73b38bbe1cd (patch)
treed2e94dac0f1f5da5cb3ecb927b78c4c2a02f4ea6 /libbb/recursive_action.c
parent37e0338781ea28f57bed354fe745effb020d16fc (diff)
downloadbusybox-w32-76f4ab68a56e14747c25e6da830cf73b38bbe1cd.tar.gz
busybox-w32-76f4ab68a56e14747c25e6da830cf73b38bbe1cd.tar.bz2
busybox-w32-76f4ab68a56e14747c25e6da830cf73b38bbe1cd.zip
Vodz, last_patch_86
git-svn-id: svn://busybox.net/trunk/busybox@6853 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/recursive_action.c')
-rw-r--r--libbb/recursive_action.c6
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;