From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 17 Jun 2002 13:31:25 +0000 (+0000)
Subject: (ange-ftp-canonize-filename): Avoid duplicate slash if DIR is just slash.
X-Git-Tag: emacs-pretest-21.2.91~227
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f35d524a87b60f6278c8070c464efa88d91e6dc3;p=emacs.git

(ange-ftp-canonize-filename): Avoid duplicate slash if DIR is just slash.
---

diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index a82a927c949..f1aaa53e637 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3017,7 +3017,8 @@ logged in as user USER and cd'd to directory DIR."
 			(rest (substring name (match-end 0)))
 			(dir (ange-ftp-expand-dir host user tilda)))
 		   (if dir
-		       (setq name (concat dir rest))
+		       (setq name (if (string-equal dir "/")
+				      rest (concat dir rest)))
 		     (error "User \"%s\" is not known"
 			    (substring tilda 1)))))