summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Griesemer <gri@golang.org>2014-08-25 15:29:47 -0700
committerRobert Griesemer <gri@golang.org>2014-08-25 15:29:47 -0700
commit6b31ff107290ad829676037dd1d9bdf5fd846346 (patch)
tree74f2d5a8825673a4137ee467c2709d4fe311d3a6
parent4b177ddaf07430b5c30acc014ec36f27ece130c0 (diff)
downloadgo-6b31ff107290ad829676037dd1d9bdf5fd846346.tar.gz
cmd/gofmt: don't permit -w with stdin
Also: use 0x644 file permission if a new file is created (should not happen anymore, though). LGTM=r R=r CC=golang-codereviews https://codereview.appspot.com/126610044
-rw-r--r--src/cmd/gofmt/gofmt.go7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index f7d30d840..f322a2b0a 100644
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -122,7 +122,7 @@ func processFile(filename string, in io.Reader, out io.Writer, stdin bool) error
fmt.Fprintln(out, filename)
}
if *write {
- err = ioutil.WriteFile(filename, res, 0)
+ err = ioutil.WriteFile(filename, res, 0644)
if err != nil {
return err
}
@@ -186,6 +186,11 @@ func gofmtMain() {
initRewrite()
if flag.NArg() == 0 {
+ if *write {
+ fmt.Fprintln(os.Stderr, "error: cannot use -w with standard input")
+ exitCode = 2
+ return
+ }
if err := processFile("<standard input>", os.Stdin, os.Stdout, true); err != nil {
report(err)
}