From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 29 May 2008 20:18:07 +0000 (+0000)
Subject: (relative_filename): Treat "///" like "/" in filenames.
X-Git-Tag: emacs-pretest-23.0.90~5222
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2926947a670b0679a34f90841fa7abc3f788474e;p=emacs.git

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

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 2dd6fb6bfa8..dc0d597e500 100644
--- 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 d18ee6c9f92..675e926f203 100644
--- 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)