mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
* refine the plan
* Fix all staticcheck lint findings (uncapped)
golangci-lint's default max-same-issues=3 was hiding most of the backlog:
the true pre-fix count was 69 staticcheck findings, not 34. This fixes all
of them, driving staticcheck to zero:
- ST1023/QF1011 (37): omit explicit types inferred from the RHS
- S1009/S1031 (15): drop redundant nil checks before len()/range
- SA9003 (9): remove comment-only empty branches, keeping the comments
- QF1007 (3): merge conditional assignment into declaration
- QF1006 (3): lift break conditions into loop conditions
- QF1001 (3): apply De Morgan's law / name the negated predicate
Also updates plans/lintfixes.md with the cap discovery and the corrected
errcheck picture (1202 uncapped, ~949 of them fmt.Fprint*).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Drive errcheck to zero: config for bulk categories, propagate real errors
Adds .golangci.yml with errcheck exclude-functions for fmt.Fprint* (usage
printers), (*bufio.Writer).Write/WriteString (sticky errors, surfaced at the
now-checked final Flush), and (*strings.Builder).WriteString; pins
max-issues-per-linter/max-same-issues to 0 so CI reports true counts.
Real error paths now propagate instead of being dropped:
- Finalize{Reader,Writer}Options in join/put/filter/split/tee and the
repl/script entry points: 'mlr join -i badformat' now errors instead of
silently using wrong separators
- final output-stream Flush in pkg/stream: write failure no longer exits 0
- DSL emit/print/dump redirect writes, matching their sibling branches
- CSV writer WriteCSVRecordMaybeColorized, close-time Flush in file output
handlers, ENV[...] Setenv, REPL record-write and redirect-close errors
- termcvt write-side Close before rename (had "TODO: check return status")
The rest are deliberate ignores, marked with _ = and a comment where the
reason isn't obvious: unset-of-missing-path no-ops, read-side closes,
mid-stream FlushOnEveryRecord, init-time strftime registrations, in-memory
usage-capture pipes, and regtest-harness env/temp-file teardown.
golangci-lint now reports 0 issues on ./cmd/mlr ./pkg/... with all caps off.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
124 lines
2.4 KiB
Go
124 lines
2.4 KiB
Go
package climain
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"regexp"
|
|
"strings"
|
|
|
|
"github.com/johnkerl/miller/v6/pkg/cli"
|
|
)
|
|
|
|
// loadMlrrcOrDie rule: If $MLRRC is set, use it and only it. Otherwise try
|
|
// first $HOME/.mlrrc and then ./.mlrrc but let them stack: e.g. $HOME/.mlrrc
|
|
// is lots of settings and maybe in one subdir you want to override just a
|
|
// setting or two.
|
|
func loadMlrrcOrDie(
|
|
options *cli.TOptions,
|
|
) {
|
|
env_mlrrc := os.Getenv("MLRRC")
|
|
|
|
if env_mlrrc != "" {
|
|
if env_mlrrc == "__none__" {
|
|
return
|
|
}
|
|
if tryLoadMlrrc(options, env_mlrrc) {
|
|
return
|
|
}
|
|
}
|
|
|
|
env_home := os.Getenv("HOME")
|
|
if env_home != "" {
|
|
path := env_home + "/.mlrrc"
|
|
tryLoadMlrrc(options, path)
|
|
}
|
|
|
|
tryLoadMlrrc(options, "./.mlrrc")
|
|
}
|
|
|
|
// tryLoadMlrrc is a helper function for loadMlrrcOrDie.
|
|
func tryLoadMlrrc(
|
|
options *cli.TOptions,
|
|
path string,
|
|
) bool {
|
|
handle, err := os.Open(path)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
defer func() { _ = handle.Close() }()
|
|
|
|
lineReader := bufio.NewReader(handle)
|
|
|
|
eof := false
|
|
lineno := 0
|
|
for !eof {
|
|
line, err := lineReader.ReadString('\n')
|
|
if err == io.EOF {
|
|
break
|
|
}
|
|
lineno++
|
|
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr: %v\n", err)
|
|
os.Exit(1)
|
|
return false
|
|
}
|
|
|
|
// This is how to do a chomp:
|
|
// TODO: handle \r\n with libified solution.
|
|
line = strings.TrimRight(line, "\n")
|
|
|
|
if !handleMlrrcLine(options, line) {
|
|
fmt.Fprintf(os.Stderr, "%s: parse error at file \"%s\" line %d: %s\n",
|
|
"mlr", path, lineno, line,
|
|
)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// handleMlrrcLine is a helper function for loadMlrrcOrDie.
|
|
func handleMlrrcLine(
|
|
options *cli.TOptions,
|
|
line string,
|
|
) bool {
|
|
|
|
// Comment-strip
|
|
re := regexp.MustCompile("#.*")
|
|
line = re.ReplaceAllString(line, "")
|
|
|
|
// Left-trim / right-trim
|
|
line = strings.TrimSpace(line)
|
|
|
|
if line == "" { // line was whitespace-only
|
|
return true
|
|
}
|
|
|
|
// Prepend initial "--" if it's not already there
|
|
if !strings.HasPrefix(line, "-") {
|
|
line = "--" + line
|
|
}
|
|
|
|
// Split line into args array
|
|
args := strings.Fields(line)
|
|
argi := 0
|
|
argc := len(args)
|
|
|
|
if args[0] == "--prepipe" || args[0] == "--prepipex" {
|
|
// Don't allow code execution via .mlrrc
|
|
return false
|
|
} else if args[0] == "--load" || args[0] == "--mload" {
|
|
// Don't allow code execution via .mlrrc
|
|
return false
|
|
} else if cli.FLAG_TABLE.Parse(args, argc, &argi, options) {
|
|
// handled
|
|
} else {
|
|
return false
|
|
}
|
|
|
|
return true
|
|
}
|