import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"sort"
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 {
}
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
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
}
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
}
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
}
cfg.Notify = ¬ify
}
- 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
}
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
}
}
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
}
}
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
}
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
}
}
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
}
}
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
}
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
}
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
}
"crypto/rand"
"fmt"
"io"
- "io/ioutil"
"os"
"path/filepath"
"strconv"
for i, recipient := range recipients {
recipients[i] = recipient % 8
}
- spool, err := ioutil.TempDir("", "testtoss")
+ spool, err := os.MkdirTemp("", "testtoss")
if err != nil {
panic(err)
}
return false
}
}
- mbox, err := ioutil.ReadFile(filepath.Join(spool, "mbox"))
+ mbox, err := os.ReadFile(filepath.Join(spool, "mbox"))
if err != nil {
return false
}
}
files[strconv.Itoa(i)] = data
}
- spool, err := ioutil.TempDir("", "testtoss")
+ spool, err := os.MkdirTemp("", "testtoss")
if err != nil {
panic(err)
}
hasher.Write(fileData)
fileName := Base32Codec.EncodeToString(hasher.Sum(nil))
src := filepath.Join(spool, fileName)
- if err := ioutil.WriteFile(src, fileData, os.FileMode(0600)); err != nil {
+ if err := os.WriteFile(src, fileData, os.FileMode(0600)); err != nil {
panic(err)
}
if err := ctx.TxFile(
hasher := MTHNew(0, 0)
hasher.Write(fileData)
fileName := Base32Codec.EncodeToString(hasher.Sum(nil))
- data, err := ioutil.ReadFile(filepath.Join(incomingPath, fileName))
+ data, err := os.ReadFile(filepath.Join(incomingPath, fileName))
if err != nil {
panic(err)
}
func TestTossFileSameName(t *testing.T) {
f := func(filesRaw uint8) bool {
files := int(filesRaw)%8 + 1
- spool, err := ioutil.TempDir("", "testtoss")
+ spool, err := os.MkdirTemp("", "testtoss")
if err != nil {
panic(err)
}
}
ctx.Neigh[*nodeOur.Id] = nodeOur.Their()
srcPath := filepath.Join(spool, "junk")
- if err = ioutil.WriteFile(
+ if err = os.WriteFile(
srcPath,
[]byte("doesnotmatter"),
os.FileMode(0600),
if len(fileSizes) == 0 {
return true
}
- spool, err := ioutil.TempDir("", "testtoss")
+ spool, err := os.MkdirTemp("", "testtoss")
if err != nil {
panic(err)
}
return false
}
for fileName, fileData := range files {
- if err := ioutil.WriteFile(
+ if err := os.WriteFile(
filepath.Join(spool, fileName),
fileData,
os.FileMode(0600),
}
datum[i] = data
}
- spool, err := ioutil.TempDir("", "testtoss")
+ spool, err := os.MkdirTemp("", "testtoss")
if err != nil {
panic(err)
}
}
hasher := MTHNew(0, 0)
hasher.Write(dst.Bytes())
- if err := ioutil.WriteFile(
+ if err := os.WriteFile(
filepath.Join(rxPath, Base32Codec.EncodeToString(hasher.Sum(nil))),
dst.Bytes(),
os.FileMode(0600),
return false
}
for _, filename := range dirFiles(txPath) {
- dataRead, err := ioutil.ReadFile(filepath.Join(txPath, filename))
+ dataRead, err := os.ReadFile(filepath.Join(txPath, filename))
if err != nil {
panic(err)
}