mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-17 16:38:54 +00:00
2f3e54d1f6
Phase 4 of plans/exit.md: the aux/terminal sub-entrypoints. pkg/auxents and
pkg/terminals are now os.Exit-free; even the dispatchers return exit codes
instead of exiting.
- auxents.Dispatch returns (handled bool, exitCode int); entrypoint.Main --
the one sanctioned exit point -- exits with the code.
- terminals.Dispatch returns an exit code; the climain caller wraps it in a
lib.ExitRequest, which also retires the 'terminal did not exit the process'
panic.
- Usage functions (hex, unhex, lecat, termcvt, repl, script, regtest) no
longer take an exitCode parameter and exit; call sites print usage and
return the code explicitly.
- Inner I/O helpers (hexDumpFile, unhexFile, lecatFile, termcvtFile) return
errors; each sub-main prints 'mlr {verb}: ...' as before and returns 1.
lecatFile formerly looped forever on a non-EOF read error; it now returns
the error.
- The regtest directory walk (Execute / executeSinglePath /
executeSingleDirectory / hasCaseSubdirectories) plumbs errors up to
RegTestMain; regression_test.go updated for the new Execute signature.
Stderr messages and exit codes are unchanged across mlr aux-list, hex, unhex,
lecat, termcvt, help, version, repl, script, and regtest surfaces (checked by
hand); all 4779 regression cases pass; make lint is clean; docs rebuild with
zero churn.
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
101 lines
2 KiB
Go
101 lines
2 KiB
Go
package auxents
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
)
|
|
|
|
func lecatUsage(verbName string, o *os.File) {
|
|
fmt.Fprintf(o, "Usage: mlr %s [options] {zero or more file names}\n", verbName)
|
|
fmt.Fprintf(o, "Simply echoes input, but flags CR characters in red and LF characters in green.\n")
|
|
fmt.Fprintf(o, "If zero file names are supplied, standard input is read.\n")
|
|
fmt.Fprintf(o, "Options:\n")
|
|
fmt.Fprintf(o, "--mono: don't try to colorize the output\n")
|
|
fmt.Fprintf(o, "-h or --help: print this message\n")
|
|
}
|
|
|
|
func lecatMain(args []string) int {
|
|
doColor := true
|
|
|
|
// 'mlr' and 'hex' are already argv[0] and argv[1].
|
|
verb := args[1]
|
|
args = args[2:]
|
|
if len(args) >= 1 {
|
|
if args[0] == "-h" || args[0] == "--help" {
|
|
lecatUsage(verb, os.Stdout)
|
|
return 0
|
|
}
|
|
|
|
if args[0][0] == '-' {
|
|
if args[0] == "--mono" {
|
|
doColor = false
|
|
args = args[1:]
|
|
} else {
|
|
fmt.Fprintf(os.Stderr, "mlr %s: unrecognized option \"%s\".\n",
|
|
verb, args[0],
|
|
)
|
|
return 1
|
|
}
|
|
}
|
|
}
|
|
|
|
if len(args) == 0 {
|
|
if err := lecatFile(os.Stdin, doColor); err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr lecat: %v\n", err)
|
|
return 1
|
|
}
|
|
} else {
|
|
for _, filename := range args {
|
|
|
|
istream, err := os.Open(filename)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr lecat: %v\n", err)
|
|
return 1
|
|
}
|
|
|
|
err = lecatFile(istream, doColor)
|
|
_ = istream.Close()
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "mlr lecat: %v\n", err)
|
|
return 1
|
|
}
|
|
}
|
|
}
|
|
return 0
|
|
}
|
|
|
|
func lecatFile(istream *os.File, doColor bool) error {
|
|
reader := bufio.NewReader(istream)
|
|
for {
|
|
c, err := reader.ReadByte()
|
|
if err == io.EOF {
|
|
break
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
switch c {
|
|
case '\r':
|
|
if doColor {
|
|
fmt.Printf("\033[31;01m") // xterm red
|
|
}
|
|
fmt.Printf("[CR]")
|
|
if doColor {
|
|
fmt.Printf("\033[0m")
|
|
}
|
|
case '\n':
|
|
if doColor {
|
|
fmt.Printf("\033[32;01m") // xterm green
|
|
}
|
|
fmt.Printf("[LF]\n")
|
|
if doColor {
|
|
fmt.Printf("\033[0m")
|
|
}
|
|
default:
|
|
fmt.Printf("%c", c)
|
|
}
|
|
}
|
|
return nil
|
|
}
|