Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ linters-settings:
exclude-functions:
# Writing a plain string to a fmt.State cannot fail.
- io.WriteString(fmt.State)
- fmt.Fprintf(fmt.State)

issues:
# Print all issues reported by all linters.
Expand Down
12 changes: 11 additions & 1 deletion cmd/errtrace/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (p *mainParams) Parse(w io.Writer, args []string) error {
flag := flag.NewFlagSet("errtrace", flag.ContinueOnError)
flag.SetOutput(w)
flag.Usage = func() {
fmt.Fprintln(w, "usage: errtrace [options] <source files | patterns>")
logln(w, "usage: errtrace [options] <source files | patterns>")
flag.PrintDefaults()
}

Expand Down Expand Up @@ -1208,3 +1208,13 @@ func nVars(prefix string, n int) []string {
}
return vars
}

func logln(w io.Writer, s string) {
// logging writes are best-effort
_, _ = fmt.Fprintln(w, s)
}

func logf(w io.Writer, format string, a ...any) {
// logging writes are best-effort
_, _ = fmt.Fprintf(w, format, a...)
}
12 changes: 8 additions & 4 deletions cmd/errtrace/toolexec.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func (cmd *mainCmd) handleToolExec(args []string) (exitCode int, handled bool) {
func (cmd *mainCmd) toolExecVersion(args []string) int {
version, err := binaryVersion()
if err != nil {
fmt.Fprintf(cmd.Stderr, "errtrace version failed: %v", err)
logf(cmd.Stderr, "errtrace version failed: %v", err)
}

tool := exec.Command(args[0], args[1:]...)
Expand All @@ -56,11 +56,15 @@ func (cmd *mainCmd) toolExecVersion(args []string) int {
return exitErr.ExitCode()
}

fmt.Fprintf(cmd.Stderr, "tool %v failed: %v", args[0], err)
logf(cmd.Stderr, "tool %v failed: %v", args[0], err)
return 1
}

if _, err := fmt.Fprintf(cmd.Stdout, "%s-errtrace-%s\n", strings.TrimSpace(stdout.String()), version); err != nil {
logf(cmd.Stderr, "failed to write version to stdout: %v", err)
return 1
}

fmt.Fprintf(cmd.Stdout, "%s-errtrace-%s\n", strings.TrimSpace(stdout.String()), version)
return 0
}

Expand Down Expand Up @@ -172,7 +176,7 @@ func (cmd *mainCmd) runOriginal(args []string) (exitCode int) {
if exitErr, ok := err.(*exec.ExitError); ok {
return exitErr.ExitCode()
}
fmt.Fprintf(cmd.Stderr, "tool %v failed: %v", args[0], err)
logf(cmd.Stderr, "tool %v failed: %v", args[0], err)
return 1
}

Expand Down