X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-file%2Fmain.go;h=9d9c694ab5e432c19bed289ceaa5c1af8fd0e4eb;hb=0367cce2741e1ce6a89a49fd5c4e9df6005c9744;hp=6870aec808c818b7c1dfb9aedcf94a2a3fc81e67;hpb=0ee0ba3784ce20e69d8db6316c99e7f0b6d30809;p=nncp.git

diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go
index 6870aec..9d9c694 100644
--- a/src/cmd/nncp-file/main.go
+++ b/src/cmd/nncp-file/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-2022 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"
 	"strings"
 
-	"go.cypherpunks.ru/nncp/v7"
+	"go.cypherpunks.ru/nncp/v8"
 )
 
 func usage() {
@@ -36,7 +36,8 @@ func usage() {
 		os.Args[0], nncp.AreaDir)
 	flag.PrintDefaults()
 	fmt.Fprint(os.Stderr, `
-If SRC equals to -, then read data from stdin to temporary file.
+If SRC equals to "-", then data is read from stdin.
+If SRC is directory, then create pax archive with its contents.
 
 -minsize/-chunked take NODE's freq.minsize/freq.chunked configuration
 options by default. You can forcefully turn them off by specifying 0 value.
@@ -48,6 +49,7 @@ func main() {
 		cfgPath      = flag.String("cfg", nncp.DefaultCfgPath, "Path to configuration file")
 		niceRaw      = flag.String("nice", nncp.NicenessFmt(nncp.DefaultNiceFile), "Outbound packet niceness")
 		argMinSize   = flag.Int64("minsize", -1, "Minimal required resulting packet size, in KiB")
+		argMaxSize   = flag.Uint64("maxsize", 0, "Maximal allowable resulting packets size, in KiB")
 		argChunkSize = flag.Int64("chunked", -1, "Split file on specified size chunks, in KiB")
 		viaOverride  = flag.String("via", "", "Override Via path to destination node")
 		spoolPath    = flag.String("spool", "", "Override path to spool")
@@ -124,6 +126,13 @@ func main() {
 	nncp.ViaOverride(*viaOverride, ctx, node)
 	ctx.Umask()
 
+	var chunkSize int64
+	if *argChunkSize < 0 {
+		chunkSize = node.FreqChunked
+	} else if *argChunkSize > 0 {
+		chunkSize = *argChunkSize * 1024
+	}
+
 	var minSize int64
 	if *argMinSize < 0 {
 		minSize = node.FreqMinSize
@@ -131,14 +140,9 @@ func main() {
 		minSize = *argMinSize * 1024
 	}
 
-	var chunkSize int64
-	if *argChunkSize < 0 {
-		chunkSize = node.FreqChunked
-	} else if *argChunkSize > 0 {
-		chunkSize = *argChunkSize * 1024
-	}
-	if chunkSize == 0 {
-		chunkSize = nncp.MaxFileSize
+	maxSize := int64(nncp.MaxFileSize)
+	if *argMaxSize > 0 {
+		maxSize = int64(*argMaxSize) * 1024
 	}
 
 	if err = ctx.TxFile(
@@ -148,7 +152,7 @@ func main() {
 		strings.Join(splitted, ":"),
 		chunkSize,
 		minSize,
-		nncp.MaxFileSize,
+		maxSize,
 		areaId,
 	); err != nil {
 		log.Fatalln(err)