X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcmd%2Fnncp-rm%2Fmain.go;h=b5274454a017cae0a0260a492c48e2ec2429d083;hb=72f42f8288689ae89e021ba33ebca8d551a784d7;hp=9589792daf6e0e58885790f19c4a29c4da42384c;hpb=cf9363f956cb2d93a581c11ed65c5b02910d10d5;p=nncp.git

diff --git a/src/cmd/nncp-rm/main.go b/src/cmd/nncp-rm/main.go
index 9589792..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 <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"io"
+	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -34,8 +36,8 @@ import (
 )
 
 func usage() {
-	fmt.Fprintf(os.Stderr, nncp.UsageHeader())
-	fmt.Fprintf(os.Stderr, "nncp-rm -- remove packet\n\n")
+	fmt.Fprint(os.Stderr, nncp.UsageHeader())
+	fmt.Fprint(os.Stderr, "nncp-rm -- remove packet\n\n")
 	fmt.Fprintf(os.Stderr, "Usage: %s [options] [-older X] -tmp\n", os.Args[0])
 	fmt.Fprintf(os.Stderr, "       %s [options] -lock\n", os.Args[0])
 	fmt.Fprintf(os.Stderr, "       %s [options] [-older X] {-all|-node NODE} -part\n", os.Args[0])
@@ -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