MTH

[nncp.git] / src / cmd / nncp-toss / main.go

diff --git a/src/cmd/nncp-toss/main.go b/src/cmd/nncp-toss/main.go
index 3f31ff9fb41d27adcff5d930e224e42a83b909e6..d6b82fb5ad13e87282f83b6d8391a0eaebccbe3d 100644 (file)
--- a/src/cmd/nncp-toss/main.go
+++ b/src/cmd/nncp-toss/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2019 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
 
 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
@@ -25,7 +25,7 @@ import (
        "os"
        "time"
 
-       "go.cypherpunks.ru/nncp/v5"
+       "go.cypherpunks.ru/nncp/v7"
 )
 
 func usage() {
@@ -43,17 +43,20 @@ func main() {
                dryRun    = flag.Bool("dryrun", false, "Do not actually write any tossed data")
                doSeen    = flag.Bool("seen", false, "Create .seen files")
                cycle     = flag.Uint("cycle", 0, "Repeat tossing after N seconds in infinite loop")
-               noFile    = flag.Bool("nofile", false, "Do not process packets with type: file")
-               noFreq    = flag.Bool("nofreq", false, "Do not process packets with type: freq")
-               noExec    = flag.Bool("noexec", false, "Do not process packets with type: exec")
-               noTrns    = flag.Bool("notrns", false, "Do not process packets with type: transitional")
+               noFile    = flag.Bool("nofile", false, "Do not process \"file\" packets")
+               noFreq    = flag.Bool("nofreq", false, "Do not process \"freq\" packets")
+               noExec    = flag.Bool("noexec", false, "Do not process \"exec\" packets")
+               noTrns    = flag.Bool("notrns", false, "Do not process \"transitional\" packets")
                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
        flag.Parse()
        if *warranty {
@@ -69,7 +72,15 @@ func main() {
                log.Fatalln(err)
        }
 
-       ctx, err := nncp.CtxFromCmdline(*cfgPath, *spoolPath, *logPath, *quiet, *debug)
+       ctx, err := nncp.CtxFromCmdline(
+               *cfgPath,
+               *spoolPath,
+               *logPath,
+               *quiet,
+               *showPrgrs,
+               *omitPrgrs,
+               *debug,
+       )
        if err != nil {
                log.Fatalln("Error during initialization:", err)
        }