diff options
| author | Russ Cox <rsc@golang.org> | 2012-09-22 05:55:09 +1000 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2012-09-22 05:55:09 +1000 |
| commit | ec783af29cc2468fa190c52e3833d492d56ab85a (patch) | |
| tree | 387791bbda2deaedf8d843eb4248cfbb99e51a5f | |
| parent | 4dfecf3675a054dc5085a9377e9c40ee50fad649 (diff) | |
| download | go-ec783af29cc2468fa190c52e3833d492d56ab85a.tar.gz go-ec783af29cc2468fa190c52e3833d492d56ab85a.zip | |
[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
»»»
| -rw-r--r-- | src/cmd/dist/build.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |