Workability of nncp-file -chunked 0

diff --git a/VERSION b/VERSION
index 831446cbd27a6de403344b21c9fa93a25357f43d..ac14c3dfaa865ea332c62348d1bca867bdbbd1cf 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.1.0
+5.1.1

diff --git a/doc/building.texi b/doc/building.texi
index 30493d116f9bf00ab66aaf56c91ae36de50d774c..3911ae5f19b5579583d75c9208477663fa4ce023 100644 (file)
--- a/doc/building.texi
+++ b/doc/building.texi
@@ -11,16 +11,16 @@ Make sure that Go is installed. For example to install it from packages:
 @end table
 
 @verbatim
-$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.0.tar.xz
-$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.0.tar.xz.sig
-$ gpg --verify nncp-5.1.0.tar.xz.sig nncp-5.1.0.tar.xz
-$ xz --decompress --stdout nncp-5.1.0.tar.xz | tar xf -
-$ make -C nncp-5.1.0 all
+$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.1.tar.xz
+$ [fetch|wget] http://www.nncpgo.org/download/nncp-5.1.1.tar.xz.sig
+$ gpg --verify nncp-5.1.1.tar.xz.sig nncp-5.1.1.tar.xz
+$ xz --decompress --stdout nncp-5.1.1.tar.xz | tar xf -
+$ make -C nncp-5.1.1 all
 @end verbatim
 
 There is @command{install} make-target respecting @env{DESTDIR}. It will
 install binaries and info-documentation:
 
 @verbatim
-# make -C nncp-5.1.0 install PREFIX=/usr/local
+# make -C nncp-5.1.1 install PREFIX=/usr/local
 @end verbatim

diff --git a/doc/cmds.texi b/doc/cmds.texi
index 1910651a74e58116c5e2b32f4c8efc6d7fc71f2b..32779f60a609973e9689a233ebe6e712609b3bf6 100644 (file)
--- a/doc/cmds.texi
+++ b/doc/cmds.texi
@@ -332,7 +332,8 @@ If @option{-chunked} is specified, then source file will be split
 KiBs. This mode is more CPU hungry. Pay attention that chunk is saved in
 spool directory immediately and it is not deleted if any error occurs.
 @option{-minsize} option is applied per each chunk. Do not forget about
-@ref{ChunkedZFS, possible} ZFS deduplication issues.
+@ref{ChunkedZFS, possible} ZFS deduplication issues. Zero
+@option{-chunked} disables chunked transmission.
 
 If @ref{CfgNotify, notification} is enabled on the remote side for
 file transmissions, then it will sent simple letter after successful

diff --git a/doc/integrity.texi b/doc/integrity.texi
index d4bd4562200441e7b04ea42bbc6007e014cf8322..2c2ccb5803383faaa80fdd261914db559875338d 100644 (file)
--- a/doc/integrity.texi
+++ b/doc/integrity.texi
@@ -31,5 +31,5 @@ $ gpg --auto-key-locate wkd --locate-keys releases at nncpgo dot org
 
 Then you could verify tarballs signature:
 @verbatim
-$ gpg --verify nncp-5.1.0.tar.xz.sig nncp-5.1.0.tar.xz
+$ gpg --verify nncp-5.1.1.tar.xz.sig nncp-5.1.1.tar.xz
 @end verbatim

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 3226116fe88e951c28d859c70824c28bfbe46a80..6cf154b9df23e7af3948851e317a41cd18716482 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,15 @@
 @node Новости
 @section Новости
 
+@node Релиз 5.1.1
+@subsection Релиз 5.1.1
+@itemize
+
+@item
+Исправлена работоспособность @command{nncp-file} с @option{-chunked 0} опцией.
+
+@end itemize
+
 @node Релиз 5.1.0
 @subsection Релиз 5.1.0
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index bc7a6fcbe96422a7349563bec49eb201ab402ded..3e04abb053d7c81487a96d082cad7d404db7c479 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,15 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 5.1.1
+@section Release 5.1.1
+@itemize
+
+@item
+Fixed workability of @command{nncp-file} with @option{-chunked 0} option.
+
+@end itemize
+
 @node Release 5.1.0
 @section Release 5.1.0
 @itemize

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 6cee3efea791651d3e2cbba050f7d61c6c5ee19d..5f62b97919b674241f411b46a51f8be581be6bc4 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD: head/net/nncp/Makefile 517819 2019-11-17 11:51:56Z dmgk $
 
 PORTNAME=      nncp
-DISTVERSION=   5.1.0
+DISTVERSION=   5.1.1
 CATEGORIES=    net
 MASTER_SITES=  http://www.nncpgo.org/download/
 

diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go
index d7c06074843642f4bc7052c2b0b10e0924264240..3257f2b71a39cb9ac38754896989b071910b5e77 100644 (file)
--- a/src/cmd/nncp-file/main.go
+++ b/src/cmd/nncp-file/main.go
@@ -108,6 +108,9 @@ func main() {
        } else if *argChunkSize > 0 {
                chunkSize = *argChunkSize * 1024
        }
+       if chunkSize == 0 {
+               chunkSize = nncp.MaxFileSize
+       }
 
        if err = ctx.TxFile(
                node,