]> Cypherpunks.ru repositories - nncp.git/blobdiff - src/cmd/nncp-rm/main.go
os.IsNotExists is deprecated
[nncp.git] / src / cmd / nncp-rm / main.go
index 1339219277d04e7f909d6b716e5ecd3e31a2915a..b5274454a017cae0a0260a492c48e2ec2429d083 100644 (file)
@@ -19,9 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 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