/*
NNCP -- Node to Node copy, utilities for store-and-forward data exchange
-Copyright (C) 2016-2022 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
"flag"
"fmt"
"io"
+ "io/fs"
"log"
"os"
"path/filepath"
)
func usage() {
- fmt.Fprintf(os.Stderr, nncp.UsageHeader())
- fmt.Fprintf(os.Stderr, "nncp-xfer -- copy inbound and outbounds packets\n\n")
+ fmt.Fprint(os.Stderr, "nncp-xfer -- copy inbound and outbounds packets\n\n")
fmt.Fprintf(os.Stderr, "Usage: %s [options] DIR\nOptions:\n", os.Args[0])
flag.PrintDefaults()
}
selfPath := filepath.Join(flag.Arg(0), ctx.SelfId.String())
isBad := false
var dir *os.File
- var fis []os.FileInfo
+ var entries []os.DirEntry
var les nncp.LEs
var logMsg func(les nncp.LEs) string
if *txOnly {
}
ctx.LogD("xfer-self", les, logMsg)
if _, err = os.Stat(selfPath); err != nil {
- if os.IsNotExist(err) {
+ if errors.Is(err, fs.ErrNotExist) {
ctx.LogD("xfer-self-no-dir", les, func(les nncp.LEs) string {
return logMsg(les) + ": no directory"
})
isBad = true
goto Tx
}
- fis, err = dir.Readdir(0)
+ entries, err = dir.ReadDir(0)
dir.Close()
if err != nil {
ctx.LogE("xfer-self-read", les, err, func(les nncp.LEs) string {
isBad = true
goto Tx
}
- for _, fi := range fis {
- if !fi.IsDir() {
+ for _, entry := range entries {
+ if !entry.IsDir() {
continue
}
- nodeId, err := nncp.NodeIdFromString(fi.Name())
- les := append(les, nncp.LE{K: "Node", V: fi.Name()})
+ nodeId, err := nncp.NodeIdFromString(entry.Name())
+ les := append(les, nncp.LE{K: "Node", V: entry.Name()})
logMsg := func(les nncp.LEs) string {
return "Packet transfer, received from " + ctx.NodeName(nodeId)
}
})
continue
}
- dir, err = os.Open(filepath.Join(selfPath, fi.Name()))
+ dir, err = os.Open(filepath.Join(selfPath, entry.Name()))
if err != nil {
ctx.LogE("xfer-rx-open", les, err, func(les nncp.LEs) string {
return logMsg(les) + ": opening"
continue
}
for _, fiInt := range fisInt {
- if !fi.IsDir() {
+ if !fiInt.IsDir() {
continue
}
// Check that it is valid Base32 encoding
string(nncp.TRx),
nncp.SeenDir,
fiInt.Name(),
- )); err == nil || !os.IsNotExist(err) {
+ )); err == nil || !errors.Is(err, fs.ErrNotExist) {
ctx.LogI("xfer-rx-seen", les, func(les nncp.LEs) string {
return logMsg(les) + ": packet already seen"
})
}
_, err = os.Stat(nodePath)
if err != nil {
- if os.IsNotExist(err) {
+ if errors.Is(err, fs.ErrNotExist) {
ctx.LogD("xfer-tx-not-exist", les, func(les nncp.LEs) string {
return logMsg(les) + ": does not exist"
})
}
_, err = os.Stat(dstPath)
if err != nil {
- if os.IsNotExist(err) {
+ if errors.Is(err, fs.ErrNotExist) {
if err = os.Mkdir(dstPath, os.FileMode(0777)); err != nil {
ctx.UnlockDir(dirLock)
ctx.LogE("xfer-tx-mkdir", les, err, logMsg)
})
continue
}
- if _, err = os.Stat(filepath.Join(dstPath, pktName)); err == nil || !os.IsNotExist(err) {
+ if _, err = os.Stat(filepath.Join(dstPath, pktName)); err == nil || !errors.Is(err, fs.ErrNotExist) {
ctx.LogD("xfer-tx-exists", les, func(les nncp.LEs) string {
return logMsg(les) + ": already exists"
})