From: Matthew Dempsky <mdempsky@google.com>
Date: Tue, 23 Feb 2016 10:14:32 +0000 (-0800)
Subject: cmd/compile: use path.Join in importfile
X-Git-Tag: go1.7beta1~1772
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e34295e64782d61725377e8d0979114bd790b47f;p=gostls13.git

cmd/compile: use path.Join in importfile

Change-Id: Ib413b0cb16405965455d7764a8c4a22bf431389b
Reviewed-on: https://go-review.googlesource.com/19850
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
---

diff --git a/src/cmd/compile/internal/gc/lex.go b/src/cmd/compile/internal/gc/lex.go
index 91280e02e5..89b442796b 100644
--- a/src/cmd/compile/internal/gc/lex.go
+++ b/src/cmd/compile/internal/gc/lex.go
@@ -729,11 +729,7 @@ func importfile(f *Val, indent []byte) {
 		if localimport != "" {
 			prefix = localimport
 		}
-		cleanbuf := prefix
-		cleanbuf += "/"
-		cleanbuf += path_
-		cleanbuf = path.Clean(cleanbuf)
-		path_ = cleanbuf
+		path_ = path.Join(prefix, path_)
 
 		if isbadimport(path_) {
 			return