Applied patch from Christophe Boyaniqu to remove double-slashes printed in

recursive_action.


git-svn-id: svn://busybox.net/trunk/busybox@2000 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 4 insertions, 1 deletions

diff --git a/utility.c b/utility.c
index 0da98f13d..0ace3eb34 100644
--- a/utility.c
+++ b/utility.c
@@ -715,7 +715,10 @@ int recursive_action(const char *fileName,
                                 return FALSE;
                         }
                         memset(nextFile, 0, sizeof(nextFile));
-                        sprintf(nextFile, "%s/%s", fileName, next->d_name);
+                        if (fileName[strlen(fileName)-1] == '/')
+                                sprintf(nextFile, "%s%s", fileName, next->d_name);
+                        else
+                                sprintf(nextFile, "%s/%s", fileName, next->d_name);
                         status =
                                 recursive_action(nextFile, TRUE, followLinks, depthFirst,
                                                                 fileAction, dirAction, userData);