Operations progress

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

diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go
index 0a02252f105ba42f16ebb40f78ebc048e0c2379f..805577e77373ffc2689e4d63bc5bde222d8a9f43 100644 (file)
--- a/src/cmd/nncp-exec/main.go
+++ b/src/cmd/nncp-exec/main.go
@@ -22,7 +22,6 @@ import (
        "bufio"
        "flag"
        "fmt"
-       "io/ioutil"
        "log"
        "os"
 
@@ -46,6 +45,8 @@ func main() {
                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")
@@ -73,7 +74,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)
        }
@@ -87,11 +96,7 @@ func main() {
        }
 
        nncp.ViaOverride(*viaOverride, ctx, node)
-
-       body, err := ioutil.ReadAll(bufio.NewReader(os.Stdin))
-       if err != nil {
-               log.Fatalln("Can not read body from stdin:", err)
-       }
+       ctx.Umask()
 
        if err = ctx.TxExec(
                node,
@@ -99,7 +104,7 @@ func main() {
                replyNice,
                flag.Args()[1],
                flag.Args()[2:],
-               body,
+               bufio.NewReader(os.Stdin),
                int64(*minSize)*1024,
        ); err != nil {
                log.Fatalln(err)