X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-exec%2Fmain.go;h=ebebd6b1b18a6beec9dde428842f261c272935bd;hb=83d7a84ab525029706b7eb6674c672626cf9793e;hp=7747f3fcf1aa478b96ee3b605c8baa7950892baa;hpb=b47dbfe6687569650fa544a4ecf3e4ea388390cb;p=nncp.git

diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go
index 7747f3f..ebebd6b 100644
--- a/src/cmd/nncp-exec/main.go
+++ b/src/cmd/nncp-exec/main.go
@@ -1,6 +1,6 @@
 /*
 NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2021 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2016-2023 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
@@ -30,8 +30,7 @@ import (
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-exec -- send execution command\n\n")
+	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",
 		os.Args[0], nncp.AreaDir)
@@ -40,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
@@ -125,7 +126,7 @@ func main() {
 		replyNice,
 		flag.Args()[1],
 		flag.Args()[2:],
-		bufio.NewReader(os.Stdin),
+		bufio.NewReaderSize(os.Stdin, nncp.MTHBlockSize),
 		int64(*minSize)*1024,
 		maxSize,
 		*noCompress,