diff options
author | Russ Cox <rsc@golang.org> | 2021-01-11 10:01:24 -0500 |
---|---|---|
committer | Roland Shoemaker <bracewell@google.com> | 2021-01-16 00:41:12 +0000 |
commit | 4bf9990a6bc8d7c44650f7f061639a2507104366 (patch) | |
tree | 111ded7c2fc31d833ae2cfcd387270f4b49cb74b | |
parent | e749a96e717718e3ac881a75f805776370302a86 (diff) | |
download | go-4bf9990a6bc8d7c44650f7f061639a2507104366.tar.gz go-4bf9990a6bc8d7c44650f7f061639a2507104366.zip |
[release-branch.go1.14-security] cmd/cgo: report exec errors a bit more clearly
Change-Id: I0e6bebf0e2e6efdef4be880e0c6c7451b938924b
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/949417
Reviewed-by: Katie Hockman <katiehockman@google.com>
Reviewed-by: Jay Conrod <jayconrod@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
(cherry picked from commit 4c2e5f85dda6ad5cc1d5be863ae62f2050f12be9)
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/955296
-rw-r--r-- | src/cmd/cgo/util.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/cgo/util.go b/src/cmd/cgo/util.go index 921306b7aa..779f7be225 100644 --- a/src/cmd/cgo/util.go +++ b/src/cmd/cgo/util.go @@ -63,7 +63,7 @@ func run(stdin []byte, argv []string) (stdout, stderr []byte, ok bool) { p.Env = append(os.Environ(), "TERM=dumb") err := p.Run() if _, ok := err.(*exec.ExitError); err != nil && !ok { - fatalf("%s", err) + fatalf("exec %s: %s", argv[0], err) } ok = p.ProcessState.Success() stdout, stderr = bout.Bytes(), berr.Bytes() @@ -88,7 +88,7 @@ func fatalf(msg string, args ...interface{}) { // If we've already printed other errors, they might have // caused the fatal condition. Assume they're enough. if nerrors == 0 { - fmt.Fprintf(os.Stderr, msg+"\n", args...) + fmt.Fprintf(os.Stderr, "cgo: "+msg+"\n", args...) } os.Exit(2) } |