Workability of nncp-file -chunked 0

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

diff --git a/src/cmd/nncp-file/main.go b/src/cmd/nncp-file/main.go
index 7cfe215a34d82b0cab9bb2a0ac0d8d84ac88f35c..3257f2b71a39cb9ac38754896989b071910b5e77 100644 (file)
--- a/src/cmd/nncp-file/main.go
+++ b/src/cmd/nncp-file/main.go
@@ -25,7 +25,7 @@ import (
        "os"
        "strings"
 
-       "go.cypherpunks.ru/nncp/v4"
+       "go.cypherpunks.ru/nncp/v5"
 )
 
 func usage() {
@@ -36,7 +36,7 @@ func usage() {
        fmt.Fprint(os.Stderr, `
 If SRC equals to -, then read data from stdin to temporary file.
 
--minsize/-chunked take NODE's FreqMinSize/FreqChunked configuration
+-minsize/-chunked take NODE's freq.minsize/freq.chunked configuration
 options by default. You can forcefully turn them off by specifying 0 value.
 `)
 }
@@ -93,6 +93,7 @@ func main() {
        }
 
        nncp.ViaOverride(*viaOverride, ctx, node)
+       ctx.Umask()
 
        var minSize int64
        if *argMinSize < 0 {
@@ -107,26 +108,19 @@ func main() {
        } else if *argChunkSize > 0 {
                chunkSize = *argChunkSize * 1024
        }
-
        if chunkSize == 0 {
-               err = ctx.TxFile(
-                       node,
-                       nice,
-                       flag.Arg(0),
-                       splitted[1],
-                       minSize,
-               )
-       } else {
-               err = ctx.TxFileChunked(
-                       node,
-                       nice,
-                       flag.Arg(0),
-                       splitted[1],
-                       minSize,
-                       chunkSize,
-               )
+               chunkSize = nncp.MaxFileSize
        }
-       if err != nil {
+
+       if err = ctx.TxFile(
+               node,
+               nice,
+               flag.Arg(0),
+               splitted[1],
+               chunkSize,
+               minSize,
+               nncp.MaxFileSize,
+       ); err != nil {
                log.Fatalln(err)
        }
 }