X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcfgdir.go;h=c1346e27a4d67f1e10b97be6167ea0002f5f24ee;hb=beefc4fd7137435caf9c653633ab938947df07f8;hp=de45a7d10a546428a6e4a614c0da165b6352a9e5;hpb=e068d88291cd45a4d6b748e258077dd6c0ffb9c2;p=nncp.git

diff --git a/src/cfgdir.go b/src/cfgdir.go
index de45a7d..c1346e2 100644
--- a/src/cfgdir.go
+++ b/src/cfgdir.go
@@ -1,6 +1,6 @@
 /*
 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
@@ -19,7 +19,6 @@ package nncp
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -65,7 +64,7 @@ func cfgDirSave(v interface{}, dst ...string) error {
 	if strings.HasSuffix(dst[len(dst)-1], "prv") {
 		mode = os.FileMode(0600)
 	}
-	return ioutil.WriteFile(filepath.Join(dst...), []byte(r+"\n"), mode)
+	return os.WriteFile(filepath.Join(dst...), []byte(r+"\n"), mode)
 }
 
 func cfgDirTouch(dst ...string) error {
@@ -433,7 +432,7 @@ func CfgToDir(dst string, cfg *CfgJSON) (err error) {
 }
 
 func cfgDirLoad(src ...string) (v string, exists bool, err error) {
-	b, err := ioutil.ReadFile(filepath.Join(src...))
+	b, err := os.ReadFile(filepath.Join(src...))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return "", false, nil
@@ -531,7 +530,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		cfg.MCDRxIfis = strings.Split(*sp, "\n")
 	}
 
-	fis, err := ioutil.ReadDir(filepath.Join(src, "mcd-send"))
+	fis, err := os.ReadDir(filepath.Join(src, "mcd-send"))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -543,7 +542,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		if n[0] == '.' {
 			continue
 		}
-		b, err := ioutil.ReadFile(filepath.Join(src, "mcd-send", fi.Name()))
+		b, err := os.ReadFile(filepath.Join(src, "mcd-send", fi.Name()))
 		if err != nil {
 			return nil, err
 		}
@@ -565,7 +564,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 			return nil, err
 		}
 	}
-	fis, err = ioutil.ReadDir(filepath.Join(src, "notify", "exec"))
+	fis, err = os.ReadDir(filepath.Join(src, "notify", "exec"))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -582,7 +581,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		cfg.Notify = &notify
 	}
 
-	if _, err = ioutil.ReadDir(filepath.Join(src, "self")); err == nil {
+	if _, err = os.ReadDir(filepath.Join(src, "self")); err == nil {
 		self := NodeOurJSON{}
 		if self.Id, err = cfgDirLoadMust(src, "self", "id"); err != nil {
 			return nil, err
@@ -611,7 +610,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 	}
 
 	cfg.Neigh = make(map[string]NodeJSON)
-	fis, err = ioutil.ReadDir(filepath.Join(src, "neigh"))
+	fis, err = os.ReadDir(filepath.Join(src, "neigh"))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -638,7 +637,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		}
 
 		node.Exec = make(map[string][]string)
-		fis2, err := ioutil.ReadDir(filepath.Join(src, "neigh", n, "exec"))
+		fis2, err := os.ReadDir(filepath.Join(src, "neigh", n, "exec"))
 		if err != nil && !os.IsNotExist(err) {
 			return nil, err
 		}
@@ -697,7 +696,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		}
 
 		node.Addrs = make(map[string]string)
-		fis2, err = ioutil.ReadDir(filepath.Join(src, "neigh", n, "addrs"))
+		fis2, err = os.ReadDir(filepath.Join(src, "neigh", n, "addrs"))
 		if err != nil && !os.IsNotExist(err) {
 			return nil, err
 		}
@@ -747,7 +746,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 			node.MaxOnlineTime = &i
 		}
 
-		fis2, err = ioutil.ReadDir(filepath.Join(src, "neigh", n, "calls"))
+		fis2, err = os.ReadDir(filepath.Join(src, "neigh", n, "calls"))
 		if err != nil && !os.IsNotExist(err) {
 			return nil, err
 		}
@@ -861,7 +860,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 	}
 
 	cfg.Areas = make(map[string]AreaJSON)
-	fis, err = ioutil.ReadDir(filepath.Join(src, "areas"))
+	fis, err = os.ReadDir(filepath.Join(src, "areas"))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -890,7 +889,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		}
 
 		area.Exec = make(map[string][]string)
-		fis2, err := ioutil.ReadDir(filepath.Join(src, "areas", n, "exec"))
+		fis2, err := os.ReadDir(filepath.Join(src, "areas", n, "exec"))
 		if err != nil && !os.IsNotExist(err) {
 			return nil, err
 		}
@@ -916,7 +915,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		cfg.Areas[n] = area
 	}
 
-	fis, err = ioutil.ReadDir(filepath.Join(src, "yggdrasil-aliases"))
+	fis, err = os.ReadDir(filepath.Join(src, "yggdrasil-aliases"))
 	if err != nil && !os.IsNotExist(err) {
 		return nil, err
 	}
@@ -928,7 +927,7 @@ func DirToCfg(src string) (*CfgJSON, error) {
 		if n[0] == '.' {
 			continue
 		}
-		b, err := ioutil.ReadFile(filepath.Join(src, "yggdrasil-aliases", fi.Name()))
+		b, err := os.ReadFile(filepath.Join(src, "yggdrasil-aliases", fi.Name()))
 		if err != nil {
 			return nil, err
 		}