From 7c507e7ddba9fe5557df06c860fe9fa6197ba2e1 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Thu, 10 Aug 2023 15:51:15 +0300 Subject: [PATCH] Remove huge usage headers, -warranty exists anyway --- src/cmd/nncp-ack/main.go | 1 - src/cmd/nncp-bundle/main.go | 1 - src/cmd/nncp-call/main.go | 1 - src/cmd/nncp-caller/main.go | 1 - src/cmd/nncp-cfgdir/main.go | 1 - src/cmd/nncp-cfgenc/main.go | 1 - src/cmd/nncp-cfgmin/main.go | 1 - src/cmd/nncp-cfgnew/main.go | 1 - src/cmd/nncp-check/main.go | 1 - src/cmd/nncp-cronexpr/main.go | 1 - src/cmd/nncp-daemon/main.go | 1 - src/cmd/nncp-exec/main.go | 1 - src/cmd/nncp-file/main.go | 1 - src/cmd/nncp-freq/main.go | 1 - src/cmd/nncp-hash/main.go | 1 - src/cmd/nncp-log/main.go | 1 - src/cmd/nncp-pkt/main.go | 1 - src/cmd/nncp-reass/main.go | 1 - src/cmd/nncp-rm/main.go | 1 - src/cmd/nncp-stat/main.go | 1 - src/cmd/nncp-toss/main.go | 1 - src/cmd/nncp-trns/main.go | 1 - src/cmd/nncp-xfer/main.go | 1 - src/nncp.go | 14 +++----------- 24 files changed, 3 insertions(+), 34 deletions(-) diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go index 20fe681..89c27bd 100644 --- a/src/cmd/nncp-ack/main.go +++ b/src/cmd/nncp-ack/main.go @@ -34,7 +34,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-ack -- send packet receipt acknowledgement\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] -all\n", os.Args[0]) fmt.Fprintf(os.Stderr, "Usage: %s [options] -node NODE[,...]\n", os.Args[0]) diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index 6fa0ab3..8c5e7a2 100644 --- a/src/cmd/nncp-bundle/main.go +++ b/src/cmd/nncp-bundle/main.go @@ -38,7 +38,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-bundle -- Create/digest stream of NNCP encrypted packets\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] -tx [-delete] NODE [NODE ...] > ...\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -rx -delete [-dryrun] [NODE ...] < ...\n", os.Args[0]) diff --git a/src/cmd/nncp-call/main.go b/src/cmd/nncp-call/main.go index f21a6e7..496ee1b 100644 --- a/src/cmd/nncp-call/main.go +++ b/src/cmd/nncp-call/main.go @@ -32,7 +32,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-call -- call TCP daemon\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE[:ADDR] [FORCEADDR]\n", os.Args[0]) fmt.Fprintln(os.Stderr, "Options:") diff --git a/src/cmd/nncp-caller/main.go b/src/cmd/nncp-caller/main.go index 8f11cc0..e1e10f7 100644 --- a/src/cmd/nncp-caller/main.go +++ b/src/cmd/nncp-caller/main.go @@ -33,7 +33,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-caller -- croned NNCP TCP daemon caller\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [NODE ...]\n", os.Args[0]) fmt.Fprintln(os.Stderr, "Options:") diff --git a/src/cmd/nncp-cfgdir/main.go b/src/cmd/nncp-cfgdir/main.go index 5697fee..c01d830 100644 --- a/src/cmd/nncp-cfgdir/main.go +++ b/src/cmd/nncp-cfgdir/main.go @@ -29,7 +29,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-cfgdir -- Convert configuration file to the directory layout.\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [-cfg ...] -dump /path/to/dir\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -load /path/to/dir > cfg.hjson\nOptions:\n", os.Args[0]) diff --git a/src/cmd/nncp-cfgenc/main.go b/src/cmd/nncp-cfgenc/main.go index c1ac70e..d2a1483 100644 --- a/src/cmd/nncp-cfgenc/main.go +++ b/src/cmd/nncp-cfgenc/main.go @@ -33,7 +33,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-cfgenc -- encrypt/decrypt configuration file\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] cfg.hjson > cfg.hjson.eblob\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -d cfg.hjson.eblob > cfg.hjson\n", os.Args[0]) diff --git a/src/cmd/nncp-cfgmin/main.go b/src/cmd/nncp-cfgmin/main.go index 459cad0..d9ca8fe 100644 --- a/src/cmd/nncp-cfgmin/main.go +++ b/src/cmd/nncp-cfgmin/main.go @@ -29,7 +29,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-cfgmin -- print stripped configuration\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-cfgnew/main.go b/src/cmd/nncp-cfgnew/main.go index debe88e..0652424 100644 --- a/src/cmd/nncp-cfgnew/main.go +++ b/src/cmd/nncp-cfgnew/main.go @@ -36,7 +36,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprintln(os.Stderr, "nncp-cfgnew -- generate new configuration and keys\nOptions:") flag.PrintDefaults() } diff --git a/src/cmd/nncp-check/main.go b/src/cmd/nncp-check/main.go index 2fc3fd6..6f5c6f0 100644 --- a/src/cmd/nncp-check/main.go +++ b/src/cmd/nncp-check/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-check -- verify Rx/Tx packets checksum\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [-nock] [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-cronexpr/main.go b/src/cmd/nncp-cronexpr/main.go index 0a4f4b7..796fa8d 100644 --- a/src/cmd/nncp-cronexpr/main.go +++ b/src/cmd/nncp-cronexpr/main.go @@ -31,7 +31,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-cronexpr -- cron expression checker\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [-num XXX] CRON-EXPRESSION\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-daemon/main.go b/src/cmd/nncp-daemon/main.go index 5ac2d73..1ae9e94 100644 --- a/src/cmd/nncp-daemon/main.go +++ b/src/cmd/nncp-daemon/main.go @@ -36,7 +36,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-daemon -- TCP daemon\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go index f7a28c4..bd0b7a2 100644 --- a/src/cmd/nncp-exec/main.go +++ b/src/cmd/nncp-exec/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-exec -- send execution command\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE HANDLE [ARG0 ARG1 ...]\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] %s:AREA HANDLE [ARG0 ARG1 ...]\nOptions:\n", diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go index abcf8bc..f2a09de 100644 --- a/src/cmd/nncp-file/main.go +++ b/src/cmd/nncp-file/main.go @@ -29,7 +29,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-file -- send file\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] SRC NODE:[DST]\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] SRC %s:AREA:[DST]\nOptions:\n", diff --git a/src/cmd/nncp-freq/main.go b/src/cmd/nncp-freq/main.go index 9c1f41f..b211136 100644 --- a/src/cmd/nncp-freq/main.go +++ b/src/cmd/nncp-freq/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-freq -- send file request\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] NODE:SRC [DST]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-hash/main.go b/src/cmd/nncp-hash/main.go index c349007..d517e35 100644 --- a/src/cmd/nncp-hash/main.go +++ b/src/cmd/nncp-hash/main.go @@ -32,7 +32,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-hash -- calculate MTH hash of the file\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [-file ...] [-seek X] [-debug] [-progress] [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-log/main.go b/src/cmd/nncp-log/main.go index 73d09af..0ad3888 100644 --- a/src/cmd/nncp-log/main.go +++ b/src/cmd/nncp-log/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-log -- read logs\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-pkt/main.go b/src/cmd/nncp-pkt/main.go index e8377b2..afc638c 100644 --- a/src/cmd/nncp-pkt/main.go +++ b/src/cmd/nncp-pkt/main.go @@ -33,7 +33,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-pkt -- parse raw packet\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go index fc71bd0..7a23ac7 100644 --- a/src/cmd/nncp-reass/main.go +++ b/src/cmd/nncp-reass/main.go @@ -40,7 +40,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-reass -- reassemble chunked files\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [FILE.nncp.meta]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index b527445..f2fc4e4 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -36,7 +36,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-rm -- remove packet\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [-older X] -tmp\n", os.Args[0]) fmt.Fprintf(os.Stderr, " %s [options] -lock\n", os.Args[0]) diff --git a/src/cmd/nncp-stat/main.go b/src/cmd/nncp-stat/main.go index 1fc0fb1..4bd8c0f 100644 --- a/src/cmd/nncp-stat/main.go +++ b/src/cmd/nncp-stat/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-stat -- show queued Rx/Tx stats\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] [-pkt] [-node NODE]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go index e2bf968..dad1d3e 100644 --- a/src/cmd/nncp-toss/main.go +++ b/src/cmd/nncp-toss/main.go @@ -30,7 +30,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-toss -- process inbound packets\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options]\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/cmd/nncp-trns/main.go b/src/cmd/nncp-trns/main.go index f48bad6..c587b80 100644 --- a/src/cmd/nncp-trns/main.go +++ b/src/cmd/nncp-trns/main.go @@ -31,7 +31,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-trns -- transit existing encrypted packet\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] -via NODEx[,...] NODE:PKT\n", os.Args[0]) fmt.Fprintf(os.Stderr, " (to transit SPOOL/NODE/tx/PKT)\n") diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go index 73a6fc2..d92e8b9 100644 --- a/src/cmd/nncp-xfer/main.go +++ b/src/cmd/nncp-xfer/main.go @@ -34,7 +34,6 @@ import ( ) func usage() { - fmt.Fprint(os.Stderr, nncp.UsageHeader()) fmt.Fprint(os.Stderr, "nncp-xfer -- copy inbound and outbounds packets\n\n") fmt.Fprintf(os.Stderr, "Usage: %s [options] DIR\nOptions:\n", os.Args[0]) flag.PrintDefaults() diff --git a/src/nncp.go b/src/nncp.go index 5b6ef8b..8ee3fb0 100644 --- a/src/nncp.go +++ b/src/nncp.go @@ -24,7 +24,9 @@ import ( ) const ( - Warranty = `This program is free software: you can redistribute it and/or modify + Warranty = `Copyright (C) 2016-2023 Sergey Matveev + +This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3 of the License. @@ -48,13 +50,3 @@ var ( func VersionGet() string { return "NNCP version " + Version + " built with " + runtime.Version() } - -func UsageHeader() string { - return VersionGet() + ` -Copyright (C) 2016-2023 Sergey Matveev -License GPLv3: GNU GPL version 3 -This is free software: you are free to change and redistribute it. -There is NO WARRANTY, to the extent permitted by law. - -` -} -- 2.44.0