From 83d7a84ab525029706b7eb6674c672626cf9793e Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 13 Aug 2023 19:48:26 +0300 Subject: [PATCH] Wrap long lines --- src/cmd/nncp-ack/main.go | 5 +++-- src/cmd/nncp-call/main.go | 32 +++++++++++++++++++++----------- src/cmd/nncp-caller/main.go | 24 ++++++++++++++++-------- src/cmd/nncp-daemon/main.go | 27 ++++++++++++++++++--------- src/cmd/nncp-exec/main.go | 32 +++++++++++++++++--------------- src/cmd/nncp-file/main.go | 5 +++-- src/cmd/nncp-freq/main.go | 28 +++++++++++++++------------- src/cmd/nncp-rm/main.go | 12 ++++++++---- src/cmd/nncp-trns/main.go | 5 +++-- 9 files changed, 104 insertions(+), 66 deletions(-) diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go index 89c27bd..7342c84 100644 --- a/src/cmd/nncp-ack/main.go +++ b/src/cmd/nncp-ack/main.go @@ -44,8 +44,9 @@ func usage() { func main() { var ( - cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") - niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), "Outbound packet niceness") + cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), + "Outbound packet niceness") minSizeRaw = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") viaOverride = flag.String("via", "", "Override Via path to destination node (ignored with -all)") spoolPath = flag.String("spool", "", "Override path to spool") diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go index 496ee1b..a684c98 100644 --- a/src/cmd/nncp-call/main.go +++ b/src/cmd/nncp-call/main.go @@ -60,17 +60,27 @@ func main() { version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - onlineDeadlineSec = flag.Uint("onlinedeadline", 0, "Override onlinedeadline option") - maxOnlineTimeSec = flag.Uint("maxonlinetime", 0, "Override maxonlinetime option") - - autoToss = flag.Bool("autotoss", false, "Toss after call is finished") - autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing") - autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing") - autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing") - autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing") - autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing") - autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing") - autoTossNoACK = flag.Bool("autotoss-noack", false, "Do not process \"ack\" packets during tossing") + onlineDeadlineSec = flag.Uint("onlinedeadline", 0, + "Override onlinedeadline option") + maxOnlineTimeSec = flag.Uint("maxonlinetime", 0, + "Override maxonlinetime option") + + autoToss = flag.Bool("autotoss", false, + "Toss after call is finished") + autoTossDoSeen = flag.Bool("autotoss-seen", false, + "Create seen/ files during tossing") + autoTossNoFile = flag.Bool("autotoss-nofile", false, + "Do not process \"file\" packets during tossing") + autoTossNoFreq = flag.Bool("autotoss-nofreq", false, + "Do not process \"freq\" packets during tossing") + autoTossNoExec = flag.Bool("autotoss-noexec", false, + "Do not process \"exec\" packets during tossing") + autoTossNoTrns = flag.Bool("autotoss-notrns", false, + "Do not process \"trns\" packets during tossing") + autoTossNoArea = flag.Bool("autotoss-noarea", false, + "Do not process \"area\" packets during tossing") + autoTossNoACK = flag.Bool("autotoss-noack", false, + "Do not process \"ack\" packets during tossing") ) log.SetFlags(log.Lshortfile) flag.Usage = usage diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go index e1e10f7..08c4afa 100644 --- a/src/cmd/nncp-caller/main.go +++ b/src/cmd/nncp-caller/main.go @@ -51,14 +51,22 @@ func main() { version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - autoToss = flag.Bool("autotoss", false, "Toss after call is finished") - autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing") - autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing") - autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing") - autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing") - autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing") - autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing") - autoTossNoACK = flag.Bool("autotoss-noack", false, "Do not process \"ack\" packets during tossing") + autoToss = flag.Bool("autotoss", false, + "Toss after call is finished") + autoTossDoSeen = flag.Bool("autotoss-seen", false, + "Create seen/ files during tossing") + autoTossNoFile = flag.Bool("autotoss-nofile", false, + "Do not process \"file\" packets during tossing") + autoTossNoFreq = flag.Bool("autotoss-nofreq", false, + "Do not process \"freq\" packets during tossing") + autoTossNoExec = flag.Bool("autotoss-noexec", false, + "Do not process \"exec\" packets during tossing") + autoTossNoTrns = flag.Bool("autotoss-notrns", false, + "Do not process \"trns\" packets during tossing") + autoTossNoArea = flag.Bool("autotoss-noarea", false, + "Do not process \"area\" packets during tossing") + autoTossNoACK = flag.Bool("autotoss-noack", false, + "Do not process \"ack\" packets during tossing") ) log.SetFlags(log.Lshortfile) flag.Usage = usage diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go index 1ae9e94..f4bf2c3 100644 --- a/src/cmd/nncp-daemon/main.go +++ b/src/cmd/nncp-daemon/main.go @@ -137,7 +137,8 @@ func main() { bind = flag.String("bind", "[::]:5400", "Address to bind to") ucspi = flag.Bool("ucspi", false, "Is it started as UCSPI-TCP server") inetd = flag.Bool("inetd", false, "Obsolete, use -ucspi") - yggdrasil = flag.String("yggdrasil", "", "Start Yggdrasil listener: yggdrasils://PRV[:PORT]?[bind=BIND][&pub=PUB][&peer=PEER][&mcast=REGEX[:PORT]]") + yggdrasil = flag.String("yggdrasil", "", + "Start Yggdrasil listener: yggdrasils://PRV[:PORT]?[bind=BIND][&pub=PUB][&peer=PEER][&mcast=REGEX[:PORT]]") maxConn = flag.Int("maxconn", 128, "Maximal number of simultaneous connections") noCK = flag.Bool("nock", false, "Do no checksum checking") mcdOnce = flag.Bool("mcd-once", false, "Send MCDs once and quit") @@ -150,14 +151,22 @@ func main() { version = flag.Bool("version", false, "Print version information") warranty = flag.Bool("warranty", false, "Print warranty information") - autoToss = flag.Bool("autotoss", false, "Toss after call is finished") - autoTossDoSeen = flag.Bool("autotoss-seen", false, "Create seen/ files during tossing") - autoTossNoFile = flag.Bool("autotoss-nofile", false, "Do not process \"file\" packets during tossing") - autoTossNoFreq = flag.Bool("autotoss-nofreq", false, "Do not process \"freq\" packets during tossing") - autoTossNoExec = flag.Bool("autotoss-noexec", false, "Do not process \"exec\" packets during tossing") - autoTossNoTrns = flag.Bool("autotoss-notrns", false, "Do not process \"trns\" packets during tossing") - autoTossNoArea = flag.Bool("autotoss-noarea", false, "Do not process \"area\" packets during tossing") - autoTossNoACK = flag.Bool("autotoss-noack", false, "Do not process \"ack\" packets during tossing") + autoToss = flag.Bool("autotoss", false, + "Toss after call is finished") + autoTossDoSeen = flag.Bool("autotoss-seen", false, + "Create seen/ files during tossing") + autoTossNoFile = flag.Bool("autotoss-nofile", false, + "Do not process \"file\" packets during tossing") + autoTossNoFreq = flag.Bool("autotoss-nofreq", false, + "Do not process \"freq\" packets during tossing") + autoTossNoExec = flag.Bool("autotoss-noexec", false, + "Do not process \"exec\" packets during tossing") + autoTossNoTrns = flag.Bool("autotoss-notrns", false, + "Do not process \"trns\" packets during tossing") + autoTossNoArea = flag.Bool("autotoss-noarea", false, + "Do not process \"area\" packets during tossing") + autoTossNoACK = flag.Bool("autotoss-noack", false, + "Do not process \"ack\" packets during tossing") ) log.SetFlags(log.Lshortfile) flag.Usage = usage diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go index bd0b7a2..ebebd6b 100644 --- a/src/cmd/nncp-exec/main.go +++ b/src/cmd/nncp-exec/main.go @@ -39,21 +39,23 @@ func usage() { func main() { var ( - noCompress = flag.Bool("nocompress", false, "Do not compress input data") - cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") - niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceExec), "Outbound packet niceness") - replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Possible reply packet niceness") - minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") - argMaxSize = flag.Uint64("maxsize", 0, "Maximal allowable resulting packet size, in KiB") - viaOverride = flag.String("via", "", "Override Via path to destination node") - spoolPath = flag.String("spool", "", "Override path to spool") - logPath = flag.String("log", "", "Override path to logfile") - quiet = flag.Bool("quiet", false, "Print only errors") - showPrgrs = flag.Bool("progress", false, "Force progress showing") - omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing") - debug = flag.Bool("debug", false, "Print debug messages") - version = flag.Bool("version", false, "Print version information") - warranty = flag.Bool("warranty", false, "Print warranty information") + noCompress = flag.Bool("nocompress", false, "Do not compress input data") + cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceExec), + "Outbound packet niceness") + replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), + "Possible reply packet niceness") + minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") + argMaxSize = flag.Uint64("maxsize", 0, "Maximal allowable resulting packet size, in KiB") + viaOverride = flag.String("via", "", "Override Via path to destination node") + spoolPath = flag.String("spool", "", "Override path to spool") + logPath = flag.String("log", "", "Override path to logfile") + quiet = flag.Bool("quiet", false, "Print only errors") + showPrgrs = flag.Bool("progress", false, "Force progress showing") + omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing") + debug = flag.Bool("debug", false, "Print debug messages") + version = flag.Bool("version", false, "Print version information") + warranty = flag.Bool("warranty", false, "Print warranty information") ) log.SetFlags(log.Lshortfile) flag.Usage = usage diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go index f2a09de..a101431 100644 --- a/src/cmd/nncp-file/main.go +++ b/src/cmd/nncp-file/main.go @@ -45,8 +45,9 @@ options by default. You can forcefully turn them off by specifying 0 value. func main() { var ( - cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") - niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Outbound packet niceness") + cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFile), + "Outbound packet niceness") argMinSize = flag.Int64("minsize", -1, "Minimal required resulting packet size, in KiB") argMaxSize = flag.Uint64("maxsize", 0, "Maximal allowable resulting packets size, in KiB") argChunkSize = flag.Int64("chunked", -1, "Split file on specified size chunks, in KiB") diff --git a/src/cmd/nncp-freq/main.go b/src/cmd/nncp-freq/main.go index b211136..986cc61 100644 --- a/src/cmd/nncp-freq/main.go +++ b/src/cmd/nncp-freq/main.go @@ -37,19 +37,21 @@ func usage() { func main() { var ( - cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") - niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), "Outbound packet niceness") - replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Reply file packet niceness") - minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") - viaOverride = flag.String("via", "", "Override Via path to destination node") - spoolPath = flag.String("spool", "", "Override path to spool") - logPath = flag.String("log", "", "Override path to logfile") - quiet = flag.Bool("quiet", false, "Print only errors") - showPrgrs = flag.Bool("progress", false, "Force progress showing") - omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing") - debug = flag.Bool("debug", false, "Print debug messages") - version = flag.Bool("version", false, "Print version information") - warranty = flag.Bool("warranty", false, "Print warranty information") + cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFreq), + "Outbound packet niceness") + replyNiceRaw = flag.String("replynice", nncp.NicenessFmt(nncp.DefaultNiceFile), + "Reply file packet niceness") + minSize = flag.Uint64("minsize", 0, "Minimal required resulting packet size, in KiB") + viaOverride = flag.String("via", "", "Override Via path to destination node") + spoolPath = flag.String("spool", "", "Override path to spool") + logPath = flag.String("log", "", "Override path to logfile") + quiet = flag.Bool("quiet", false, "Print only errors") + showPrgrs = flag.Bool("progress", false, "Force progress showing") + omitPrgrs = flag.Bool("noprogress", false, "Omit progress showing") + debug = flag.Bool("debug", false, "Print debug messages") + version = flag.Bool("version", false, "Print version information") + warranty = flag.Bool("warranty", false, "Print warranty information") ) log.SetFlags(log.Lshortfile) flag.Usage = usage diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index f2fc4e4..b1d1524 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -250,9 +250,11 @@ func main() { return err } if now.Sub(info.ModTime()) < oldBoundary { - ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: pth}}, func(les nncp.LEs) string { - return fmt.Sprintf("File %s: too fresh, skipping", pth) - }) + ctx.LogD("rm-skip", nncp.LEs{{K: "File", V: pth}}, + func(les nncp.LEs) string { + return fmt.Sprintf("File %s: too fresh, skipping", pth) + }, + ) continue } if (*doNoCK && strings.HasSuffix(entry.Name(), nncp.NoCKSuffix)) || @@ -292,7 +294,9 @@ func main() { } } removeSub := func(p string) error { - return filepath.Walk(p, func(path string, info os.FileInfo, err error) error { + return filepath.Walk(p, func( + path string, info os.FileInfo, err error, + ) error { if err != nil { if errors.Is(err, fs.ErrNotExist) { return nil diff --git a/src/cmd/nncp-trns/main.go b/src/cmd/nncp-trns/main.go index c587b80..ad023e9 100644 --- a/src/cmd/nncp-trns/main.go +++ b/src/cmd/nncp-trns/main.go @@ -41,8 +41,9 @@ func usage() { func main() { var ( - cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") - niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Outbound packet niceness") + cfgPath = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file") + niceRaw = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFile), + "Outbound packet niceness") viaOverride = flag.String("via", "", "Override Via path to destination node") spoolPath = flag.String("spool", "", "Override path to spool") logPath = flag.String("log", "", "Override path to logfile") -- 2.44.0