X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-exec%2Fmain.go;h=bd0b7a2ab64ccf83323dc97a9fe8905160de44f6;hb=7c507e7ddba9fe5557df06c860fe9fa6197ba2e1;hp=11a99073bb441ab06642ae27f1ebb72babe555d6;hpb=ab7c7eca0e53661f0ba904c2a6ba752990bea367;p=nncp.git

diff --git a/src/cmd/nncp-exec/main.go b/src/cmd/nncp-exec/main.go
index 11a9907..bd0b7a2 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
@@ -26,12 +26,11 @@ import (
 	"os"
 	"strings"
 
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 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,12 +39,12 @@ func usage() {
 
 func main() {
 	var (
-		useTmp       = flag.Bool("use-tmp", false, "Use temporary file, instead of memory buffer")
 		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")
@@ -111,6 +110,11 @@ func main() {
 		}
 	}
 
+	maxSize := int64(nncp.MaxFileSize)
+	if *argMaxSize > 0 {
+		maxSize = int64(*argMaxSize) * 1024
+	}
+
 	nncp.ViaOverride(*viaOverride, ctx, node)
 	ctx.Umask()
 
@@ -120,9 +124,9 @@ func main() {
 		replyNice,
 		flag.Args()[1],
 		flag.Args()[2:],
-		bufio.NewReader(os.Stdin),
+		bufio.NewReaderSize(os.Stdin, nncp.MTHBlockSize),
 		int64(*minSize)*1024,
-		*useTmp,
+		maxSize,
 		*noCompress,
 		areaId,
 	); err != nil {