From 7e18d9b549a16461126bf826bb762131734b9f15 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 26 May 2017 11:23:19 +1000 Subject: [PATCH] Handle clang-format's stderr more nicely. --- cmd/internal/cgen/cgen.go | 19 +++++++------------ lang/generate/generate.go | 5 ++++- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/cmd/internal/cgen/cgen.go b/cmd/internal/cgen/cgen.go index d61ede2f..ff863ea5 100644 --- a/cmd/internal/cgen/cgen.go +++ b/cmd/internal/cgen/cgen.go @@ -7,8 +7,8 @@ package cgen import ( "bytes" - "errors" "fmt" + "os" "os/exec" ) @@ -34,18 +34,13 @@ func (g *Generator) WritePostamble(w *bytes.Buffer) error { } func (g *Generator) Format(rawSource []byte) ([]byte, error) { + stdout := &bytes.Buffer{} cmd := exec.Command("clang-format", "-style=Chromium") cmd.Stdin = bytes.NewReader(rawSource) - out, err := cmd.CombinedOutput() - if _, ok := err.(*exec.ExitError); ok && len(out) > 0 { - // Go error messages usually don't end in "\n". The caller, who sees - // the error we return here, usually adds the "\n" themselves. - if out[len(out)-1] == '\n' { - out = out[:len(out)-1] - } - // The exec.ExitError's Error message doesn't include stderr, so we - // return that explicitly. - return nil, errors.New(string(out)) + cmd.Stdout = stdout + cmd.Stderr = os.Stderr + if err := cmd.Run(); err != nil { + return nil, err } - return out, err + return stdout.Bytes(), nil } diff --git a/lang/generate/generate.go b/lang/generate/generate.go index 623c7df8..10c52d28 100644 --- a/lang/generate/generate.go +++ b/lang/generate/generate.go @@ -8,6 +8,7 @@ import ( "flag" "io/ioutil" "os" + "os/exec" "github.com/google/puffs/lang/ast" "github.com/google/puffs/lang/check" @@ -28,7 +29,9 @@ type Generator interface { func Main(g Generator) { if err := main1(g); err != nil { - os.Stderr.WriteString(err.Error() + "\n") + if _, ok := err.(*exec.ExitError); !ok { + os.Stderr.WriteString(err.Error() + "\n") + } os.Exit(1) } }