Remove huge usage headers, -warranty exists anyway

diff --git a/src/cmd/nncp-ack/main.go b/src/cmd/nncp-ack/main.go
index 20fe68121686cf9b721d17bbf2fb2dbaac8892a4..89c27bdbe472f3a8d2b17df01e286e998ef08d71 100644 (file)
--- 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 6fa0ab3642489d76fa04cf22d693c73c45f31cb1..8c5e7a2a98bf0d0585678bebc4a859420339ceb5 100644 (file)
--- 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 f21a6e72212979da119273bba413b17c61590f5c..496ee1bc27598d392a5e6685dcc594ebda0003b4 100644 (file)
--- 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 8f11cc0922e5aac43647cd169c0cf07b8417ebbe..e1e10f78729babb23f3b2023ea527b6947c299e9 100644 (file)
--- 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 5697feec32bc384f372be2ad86d11632810876fd..c01d830e83d751840332a0f4e3d0383e352ff615 100644 (file)
--- 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 c1ac70e40565b646de9fc7af33900790cbe9bdd1..d2a1483d9ebd3595e4fb237ebe1eb9f1b151649e 100644 (file)
--- 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 459cad0a7385aff1acf5127d4dc6c4009793c6f5..d9ca8fe250eff9555804fd1605453decad80d271 100644 (file)
--- 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 debe88e0d2d5811b2085479c999dab16fbde64ba..0652424ab8b7cbd7b733d1fefb9818692b0e730d 100644 (file)
--- 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 2fc3fd6d78f30ac5d3838e1a0e2f2f6ff221fdcb..6f5c6f05f30a276f91ed7bd4756f08cc564406e1 100644 (file)
--- 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 0a4f4b70795669f76a51ab56cbd4ff9c2e39d1d0..796fa8d319605875bc7dc018a2cb7f929bbf67dc 100644 (file)
--- 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 5ac2d73e8bdf7f02b9be6a134dcc69d4b25e0789..1ae9e94ead91954911041ee82c45742d17a84bf7 100644 (file)
--- 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 f7a28c41872c15820a06f96eac1f6466763a7450..bd0b7a2ab64ccf83323dc97a9fe8905160de44f6 100644 (file)
--- 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 abcf8bc76621d4430c760da4740770061a6f6ce7..f2a09de77f7e4dff95ddd59449d66d1a37a93ef3 100644 (file)
--- 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 9c1f41fe1905c1d28b15ca6a49e24b758cd2bac6..b21113697ed51718737e52709c4681b788bdfdd1 100644 (file)
--- 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 c349007ac7c78a4b7c7c2c61ad53328ab0ebbde1..d517e356367f577389bfcb2be5dd711dd1a35d1a 100644 (file)
--- 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 73d09afa362d864fee50ac5b5c9205174dc4503f..0ad3888415f6fdfab24c31502a6296e2d902fdce 100644 (file)
--- 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 e8377b2e5b9d38feb4d85c6543538989e1e3c120..afc638c792a2f411a89288bafacdb2caa0b7eb1f 100644 (file)
--- 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 fc71bd05e47e5ab793583705bcf5c374636d872b..7a23ac74f4fc826539f23a721e7281295d18c15f 100644 (file)
--- 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 b5274454a017cae0a0260a492c48e2ec2429d083..f2fc4e47f933e7b57da3eb4238a3575d6dcb2255 100644 (file)
--- 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 1fc0fb13e8f0924e4b5248dcb5b3bfcd01c00736..4bd8c0fc037f2b48c120675e20e67647cd50c3f6 100644 (file)
--- 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 e2bf96844a82ea0d39714d0f0d7fd2cf9a6dbfe4..dad1d3ee979120fc6a21c64bec94a7237b02f912 100644 (file)
--- 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 f48bad6ad95bc84a7b5edb12d68da9c5dd1ce63e..c587b802a9fa72e616f080a064f357ef347de232 100644 (file)
--- 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 73a6fc223b6d70d194485496cc53af7f0ec0c61c..d92e8b9dd8c807868c449bbd3b785de30f5bcf0c 100644 (file)
--- 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 5b6ef8bbfebf2a8e07529e1db9eb0e432818f2a0..8ee3fb0d595a56719dca9bdc6dff7b78bba4aa54 100644 (file)
--- 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 <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-`
-}