Applied patch from Christophe Boyaniqu to remove double-slashes printed in
authorMark Whitley <markw@lineo.com>
Wed, 7 Mar 2001 17:27:04 +0000 (17:27 -0000)
committerMark Whitley <markw@lineo.com>
Wed, 7 Mar 2001 17:27:04 +0000 (17:27 -0000)
recursive_action.

utility.c

index 0da98f1..0ace3eb 100644 (file)
--- 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);