diff options
Diffstat (limited to 'src/cmd/gofix/main.go')
-rw-r--r-- | src/cmd/gofix/main.go | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/cmd/gofix/main.go b/src/cmd/gofix/main.go index 4f7e923e3..ba2061a00 100644 --- a/src/cmd/gofix/main.go +++ b/src/cmd/gofix/main.go @@ -248,17 +248,5 @@ func diff(b1, b2 []byte) (data []byte, err os.Error) { f1.Write(b1) f2.Write(b2) - diffcmd, err := exec.LookPath("diff") - if err != nil { - return nil, err - } - - c, err := exec.Run(diffcmd, []string{"diff", f1.Name(), f2.Name()}, nil, "", - exec.DevNull, exec.Pipe, exec.MergeWithStdout) - if err != nil { - return nil, err - } - defer c.Close() - - return ioutil.ReadAll(c.Stdout) + return exec.Command("diff", f1.Name(), f2.Name()).CombinedOutput() } |