From: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Date: Mon, 25 Jul 2016 19:13:15 +0000 (+0900)
Subject: syscall: mksyscall_windows.go: put path separator in suffix for matching GOROOT
X-Git-Tag: go1.8beta1~1823
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5dc7525b3e04dc7384e11b986ed13ac130afa748;p=gostls13.git

syscall: mksyscall_windows.go: put path separator in suffix for matching GOROOT

fixes #16493

Change-Id: I86bec2f9bd7965449c43e94733791f7cb18c5c4c
Reviewed-on: https://go-review.googlesource.com/25165
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>
---

diff --git a/src/syscall/mksyscall_windows.go b/src/syscall/mksyscall_windows.go
index 1e0d9401e7..4f9c5d2ff9 100644
--- a/src/syscall/mksyscall_windows.go
+++ b/src/syscall/mksyscall_windows.go
@@ -708,6 +708,10 @@ func (src *Source) IsStdRepo() (bool, error) {
 		abspath = strings.ToLower(abspath)
 		goroot = strings.ToLower(goroot)
 	}
+	sep := string(os.PathSeparator)
+	if !strings.HasSuffix(goroot, sep) {
+		goroot += sep
+	}
 	return strings.HasPrefix(abspath, goroot), nil
 }