tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correctly report errors in bpfmt

Browse source 
bpfmt was always exiting with return code 0, make it use the
exitCode recorded when reporting errors.

Also use the usage function.

Test: bpfmt -o bpfmt.go
Test: bpfmt
Test: bpfmt -h
Fixes: 113069050
Change-Id: I717d524c5f43cd36f52e33964a37324cc04c5df0
This commit is contained in:
Colin Cross 2019-05-21 10:22:28 -07:00
parent 19ef680bc4
commit e52c33c61c
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bpfmt/bpfmt.go
View file

@ -125,6 +125,7 @@ func walkDir(path string) {
} }
func main() { func main() {
flag.Usage = usage
flag.Parse() flag.Parse()
if !*writeToStout && !*overwriteSourceFile && !*doDiff && !*list { if !*writeToStout && !*overwriteSourceFile && !*doDiff && !*list {
@ -135,8 +136,7 @@ func main() {
// file to parse is stdin // file to parse is stdin
if *overwriteSourceFile { if *overwriteSourceFile {
fmt.Fprintln(os.Stderr, "error: cannot use -w with standard input") fmt.Fprintln(os.Stderr, "error: cannot use -w with standard input")
exitCode = 2 os.Exit(2)
return
} }
if err := processReader("<standard input>", os.Stdin, os.Stdout); err != nil { if err := processReader("<standard input>", os.Stdin, os.Stdout); err != nil {
report(err) report(err)
@ -157,6 +157,8 @@ func main() {
} }
} }
} }
os.Exit(exitCode)
} }
func diff(b1, b2 []byte) (data []byte, err error) { func diff(b1, b2 []byte) (data []byte, err error) {