/*
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
"fmt"
"hash"
"io"
+ "io/fs"
"log"
"os"
"path/filepath"
xdr "github.com/davecgh/go-xdr/xdr2"
"github.com/dustin/go-humanize"
- "go.cypherpunks.ru/nncp/v7"
+ "go.cypherpunks.ru/nncp/v8"
)
func usage() {
- fmt.Fprintf(os.Stderr, nncp.UsageHeader())
- fmt.Fprintf(os.Stderr, "nncp-reass -- reassemble chunked files\n\n")
+ fmt.Fprint(os.Stderr, nncp.UsageHeader())
+ fmt.Fprint(os.Stderr, "nncp-reass -- reassemble chunked files\n\n")
fmt.Fprintf(os.Stderr, "Usage: %s [options] [FILE.nncp.meta]\nOptions:\n", os.Args[0])
flag.PrintDefaults()
fmt.Fprint(os.Stderr, `
func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bool {
fd, err := os.Open(path)
- defer fd.Close()
if err != nil {
log.Fatalln("Can not open file:", err)
}
+ defer fd.Close()
var metaPkt nncp.ChunkedMeta
les := nncp.LEs{{K: "Path", V: path}}
logMsg := func(les nncp.LEs) string {
})
return false
}
- fd.Close() // #nosec G104
+ fd.Close()
if metaPkt.Magic == nncp.MagicNNCPMv1.B {
ctx.LogE("reass", les, nncp.MagicNNCPMv1.TooOld(), logMsg)
return false
for chunkNum, chunkPath := range chunksPaths {
fi, err := os.Stat(chunkPath)
lesChunk := append(les, nncp.LE{K: "Chunk", V: chunkNum})
- if err != nil && os.IsNotExist(err) {
+ if err != nil && errors.Is(err, fs.ErrNotExist) {
ctx.LogI("reass-chunk-miss", lesChunk, func(les nncp.LEs) string {
return fmt.Sprintf("%s: chunk %d missing", logMsg(les), chunkNum)
})
}
var badSize bool
if chunkNum+1 == len(chunksPaths) {
- badSize = uint64(fi.Size()) != metaPkt.FileSize%metaPkt.ChunkSize
+ left := metaPkt.FileSize % metaPkt.ChunkSize
+ badSize = left != 0 && uint64(fi.Size()) != left
} else {
badSize = uint64(fi.Size()) != metaPkt.ChunkSize
}
}
hsh = nncp.MTHNew(fi.Size(), 0)
if _, err = nncp.CopyProgressed(
- hsh, bufio.NewReader(fd), "check",
+ hsh, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "check",
nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
ctx.ShowPrgrs,
); err != nil {
log.Fatalln(err)
}
- fd.Close() // #nosec G104
- if bytes.Compare(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) != 0 {
+ fd.Close()
+ if !bytes.Equal(hsh.Sum(nil), metaPkt.Checksums[chunkNum][:]) {
ctx.LogE(
"reass-chunk",
nncp.LEs{{K: "Path", V: path}, {K: "Chunk", V: chunkNum}},
log.Fatalln("Can not stat file:", err)
}
if _, err = nncp.CopyProgressed(
- dstW, bufio.NewReader(fd), "reass",
+ dstW, bufio.NewReaderSize(fd, nncp.MTHBlockSize), "reass",
nncp.LEs{{K: "Pkt", V: chunkPath}, {K: "FullSize", V: fi.Size()}},
ctx.ShowPrgrs,
); err != nil {
log.Fatalln(err)
}
- fd.Close() // #nosec G104
+ fd.Close()
if !keep {
if err = os.Remove(chunkPath); err != nil {
ctx.LogE(
log.Fatalln("Can not flush:", err)
}
if tmp != nil {
- if err = tmp.Sync(); err != nil {
- log.Fatalln("Can not sync:", err)
+ if !nncp.NoSync {
+ if err = tmp.Sync(); err != nil {
+ log.Fatalln("Can not sync:", err)
+ }
}
if err = tmp.Close(); err != nil {
log.Fatalln("Can not close:", err)
dstPathCtr := 0
for {
if _, err = os.Stat(dstPath); err != nil {
- if os.IsNotExist(err) {
+ if errors.Is(err, fs.ErrNotExist) {
break
}
log.Fatalln(err)
func findMetas(ctx *nncp.Ctx, dirPath string) []string {
dir, err := os.Open(dirPath)
- defer dir.Close()
logMsg := func(les nncp.LEs) string {
return "Finding .meta in " + dirPath
}
ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
return nil
}
+ defer dir.Close()
fis, err := dir.Readdir(0)
- dir.Close() // #nosec G104
+ dir.Close()
if err != nil {
ctx.LogE("reass", nncp.LEs{{K: "Path", V: dirPath}}, err, logMsg)
return nil