From: Russ Cox <rsc@golang.org>
Date: Fri, 21 Sep 2012 19:55:09 +0000 (+1000)
Subject: [release-branch.go1] cmd/dist: emit \r in env -w output
X-Git-Tag: go1.0.3~25
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ec783af29cc2468fa190c52e3833d492d56ab85a;p=gostls13.git

[release-branch.go1] cmd/dist: emit \r in env -w output

««« backport 108165c03c70
cmd/dist: emit \r in env -w output

go tool dist env -w is supposed to print a Windows batch file.
Normally Windows will execute batch files without \r before \n,
but issue 3060 reports that if the file ends up containing paths
written in Chinese, Windows 7 cannot execute it without the \r.
So add the \r.

Fixes #3060.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6498120

»»»
---

diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index 7f9aa7bcd2..119c458471 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -1301,7 +1301,7 @@ cmdenv(int argc, char **argv)
 		vflag++;
 		break;
 	case 'w':
-		format = "set %s=%s\n";
+		format = "set %s=%s\r\n";
 		break;
 	default:
 		usage();