(relative_filename): Treat "///" like "/" in filenames.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2dd6fb6bfa81eb7a458597a688ead0d676ba0fca..dc0d597e5007e0c4559a955baa98d0a67be27f1d 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-29  Tom Tromey  <tromey@redhat.com>
+
+       * etags.c (relative_filename): Treat "///" like "/" in filenames.
+
 2008-05-09  Eli Zaretskii  <eliz@gnu.org>
 
        * ntlib.c: Include sys/types.h, sys/stat.h, and errno.h.

diff --git a/lib-src/etags.c b/lib-src/etags.c
index d18ee6c9f924addf14f1ace16f10d6881f44733b..675e926f203829d98eb06180a95183a7bdf46e5a 100644 (file)
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -6790,8 +6790,14 @@ relative_filename (file, dir)
 
   /* Build a sequence of "../" strings for the resulting relative file name. */
   i = 0;
+  while (*dp == '/')
+    ++dp;
   while ((dp = etags_strchr (dp + 1, '/')) != NULL)
-    i += 1;
+    {
+      i += 1;
+      while (*dp == '/')
+       ++dp;
+    }
   res = xnew (3*i + strlen (fp + 1) + 1, char);
   res[0] = '\0';
   while (i-- > 0)