From 72f42f8288689ae89e021ba33ebca8d551a784d7 Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sat, 29 Apr 2023 12:21:30 +0300 Subject: [PATCH] os.IsNotExists is deprecated --- src/cfgdir.go | 24 +++++++++++++----------- src/cmd/nncp-bundle/main.go | 5 +++-- src/cmd/nncp-reass/main.go | 5 +++-- src/cmd/nncp-rm/main.go | 10 ++++++---- src/cmd/nncp-xfer/main.go | 11 ++++++----- src/ctx.go | 3 ++- src/jobs.go | 4 +++- src/toss.go | 3 ++- 8 files changed, 38 insertions(+), 27 deletions(-) diff --git a/src/cfgdir.go b/src/cfgdir.go index c1346e2..f9378c8 100644 --- a/src/cfgdir.go +++ b/src/cfgdir.go @@ -18,7 +18,9 @@ along with this program. If not, see . package nncp import ( + "errors" "fmt" + "io/fs" "os" "path/filepath" "sort" @@ -434,7 +436,7 @@ func CfgToDir(dst string, cfg *CfgJSON) (err error) { func cfgDirLoad(src ...string) (v string, exists bool, err error) { b, err := os.ReadFile(filepath.Join(src...)) if err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { return "", false, nil } return "", false, err @@ -531,7 +533,7 @@ func DirToCfg(src string) (*CfgJSON, error) { } fis, err := os.ReadDir(filepath.Join(src, "mcd-send")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } if len(fis) > 0 { @@ -565,7 +567,7 @@ func DirToCfg(src string) (*CfgJSON, error) { } } fis, err = os.ReadDir(filepath.Join(src, "notify", "exec")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi := range fis { @@ -605,13 +607,13 @@ func DirToCfg(src string) (*CfgJSON, error) { return nil, err } cfg.Self = &self - } else if !os.IsNotExist(err) { + } else if !errors.Is(err, fs.ErrNotExist) { return nil, err } cfg.Neigh = make(map[string]NodeJSON) fis, err = os.ReadDir(filepath.Join(src, "neigh")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi := range fis { @@ -638,7 +640,7 @@ func DirToCfg(src string) (*CfgJSON, error) { node.Exec = make(map[string][]string) fis2, err := os.ReadDir(filepath.Join(src, "neigh", n, "exec")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi2 := range fis2 { @@ -697,7 +699,7 @@ func DirToCfg(src string) (*CfgJSON, error) { node.Addrs = make(map[string]string) fis2, err = os.ReadDir(filepath.Join(src, "neigh", n, "addrs")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi2 := range fis2 { @@ -747,7 +749,7 @@ func DirToCfg(src string) (*CfgJSON, error) { } fis2, err = os.ReadDir(filepath.Join(src, "neigh", n, "calls")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } callsIdx := make([]int, 0, len(fis2)) @@ -861,7 +863,7 @@ func DirToCfg(src string) (*CfgJSON, error) { cfg.Areas = make(map[string]AreaJSON) fis, err = os.ReadDir(filepath.Join(src, "areas")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi := range fis { @@ -890,7 +892,7 @@ func DirToCfg(src string) (*CfgJSON, error) { area.Exec = make(map[string][]string) fis2, err := os.ReadDir(filepath.Join(src, "areas", n, "exec")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } for _, fi2 := range fis2 { @@ -916,7 +918,7 @@ func DirToCfg(src string) (*CfgJSON, error) { } fis, err = os.ReadDir(filepath.Join(src, "yggdrasil-aliases")) - if err != nil && !os.IsNotExist(err) { + if err != nil && !errors.Is(err, fs.ErrNotExist) { return nil, err } if len(fis) > 0 { diff --git a/src/cmd/nncp-bundle/main.go b/src/cmd/nncp-bundle/main.go index e00da48..6fa0ab3 100644 --- a/src/cmd/nncp-bundle/main.go +++ b/src/cmd/nncp-bundle/main.go @@ -26,6 +26,7 @@ import ( "flag" "fmt" "io" + "io/fs" "log" "os" "path/filepath" @@ -407,7 +408,7 @@ func main() { } dstDirPath := filepath.Join(ctx.Spool, sender, string(nncp.TRx)) dstPath := filepath.Join(dstDirPath, pktName) - if _, err = os.Stat(dstPath); err == nil || !os.IsNotExist(err) { + if _, err = os.Stat(dstPath); err == nil || !errors.Is(err, fs.ErrNotExist) { ctx.LogD("bundle-rx-exists", les, func(les nncp.LEs) string { return logMsg(les) + ": packet already exists" }) @@ -415,7 +416,7 @@ func main() { } if _, err = os.Stat(filepath.Join( dstDirPath, nncp.SeenDir, pktName, - )); err == nil || !os.IsNotExist(err) { + )); err == nil || !errors.Is(err, fs.ErrNotExist) { ctx.LogD("bundle-rx-seen", les, func(les nncp.LEs) string { return logMsg(les) + ": packet already seen" }) diff --git a/src/cmd/nncp-reass/main.go b/src/cmd/nncp-reass/main.go index f4c1381..ac52eeb 100644 --- a/src/cmd/nncp-reass/main.go +++ b/src/cmd/nncp-reass/main.go @@ -27,6 +27,7 @@ import ( "fmt" "hash" "io" + "io/fs" "log" "os" "path/filepath" @@ -115,7 +116,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo 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) }) @@ -269,7 +270,7 @@ func process(ctx *nncp.Ctx, path string, keep, dryRun, stdout, dumpMeta bool) bo dstPathCtr := 0 for { if _, err = os.Stat(dstPath); err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { break } log.Fatalln(err) diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go index 1339219..b527445 100644 --- a/src/cmd/nncp-rm/main.go +++ b/src/cmd/nncp-rm/main.go @@ -19,9 +19,11 @@ along with this program. If not, see . package main import ( + "errors" "flag" "fmt" "io" + "io/fs" "log" "os" "path/filepath" @@ -205,12 +207,12 @@ func main() { } remove := func(xx nncp.TRxTx) error { p := filepath.Join(ctx.Spool, node.Id.String(), string(xx)) - if _, err := os.Stat(p); err != nil && os.IsNotExist(err) { + if _, err := os.Stat(p); err != nil && errors.Is(err, fs.ErrNotExist) { return nil } dir, err := os.Open(p) if err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { return nil } return err @@ -293,7 +295,7 @@ func main() { removeSub := func(p string) error { return filepath.Walk(p, func(path string, info os.FileInfo, err error) error { if err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { return nil } return err @@ -356,7 +358,7 @@ func main() { filepath.Join(ctx.Spool, node.Id.String(), nncp.AreaDir), func(path string, info os.FileInfo, err error) error { if err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { return nil } return err diff --git a/src/cmd/nncp-xfer/main.go b/src/cmd/nncp-xfer/main.go index bb74f45..8685b1c 100644 --- a/src/cmd/nncp-xfer/main.go +++ b/src/cmd/nncp-xfer/main.go @@ -24,6 +24,7 @@ import ( "flag" "fmt" "io" + "io/fs" "log" "os" "path/filepath" @@ -120,7 +121,7 @@ func main() { } 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" }) @@ -215,7 +216,7 @@ func main() { 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" }) @@ -389,7 +390,7 @@ Tx: } _, 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" }) @@ -420,7 +421,7 @@ Tx: } _, 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) @@ -450,7 +451,7 @@ Tx: }) 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" }) diff --git a/src/ctx.go b/src/ctx.go index 6232972..cf7d728 100644 --- a/src/ctx.go +++ b/src/ctx.go @@ -20,6 +20,7 @@ package nncp import ( "errors" "fmt" + "io/fs" "os" "path/filepath" "strconv" @@ -79,7 +80,7 @@ func ensureDir(dirs ...string) error { } return fmt.Errorf("%s: is not a directory", p) } - if !os.IsNotExist(err) { + if !errors.Is(err, fs.ErrNotExist) { return err } return os.MkdirAll(p, os.FileMode(0777)) diff --git a/src/jobs.go b/src/jobs.go index 9512985..ff2977b 100644 --- a/src/jobs.go +++ b/src/jobs.go @@ -19,8 +19,10 @@ package nncp import ( "bytes" + "errors" "fmt" "io" + "io/fs" "os" "path/filepath" "strings" @@ -148,7 +150,7 @@ func (ctx *Ctx) jobsFind(nodeId *NodeId, xx TRxTx, nock, part bool) chan Job { fd, err = os.Open(pth) } else { fd, err = os.Open(JobPath2Hdr(pth)) - if err != nil && os.IsNotExist(err) { + if err != nil && errors.Is(err, fs.ErrNotExist) { hdrExists = false fd, err = os.Open(pth) } diff --git a/src/toss.go b/src/toss.go index 2fab0a2..b4363f7 100644 --- a/src/toss.go +++ b/src/toss.go @@ -24,6 +24,7 @@ import ( "errors" "fmt" "io" + "io/fs" "log" "mime" "os" @@ -356,7 +357,7 @@ func jobProcess( dstPathCtr := 0 for { if _, err = os.Stat(dstPath); err != nil { - if os.IsNotExist(err) { + if errors.Is(err, fs.ErrNotExist) { break } ctx.LogE("rx-stat", les, err, func(les LEs) string { -- 2.44.0