0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00

refactor: move from io/ioutil to io and os packages

The io/ioutil package has been deprecated as of Go 1.16, see
https://golang.org/doc/go1.16#ioutil. This commit replaces the existing
io/ioutil functions with their new definitions in io and os packages.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2021-11-17 11:25:52 +08:00
parent da8beb65bf
commit 1645759742
No known key found for this signature in database
GPG key ID: DAEBBD2E34C111E6
6 changed files with 17 additions and 23 deletions

View file

@ -5,7 +5,6 @@ import (
"errors" "errors"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"os" "os"
"path" "path"
"path/filepath" "path/filepath"
@ -177,7 +176,7 @@ func getConfigFile() string {
func determinePass(c *cli.Context) (pass string) { func determinePass(c *cli.Context) (pass string) {
pass = c.String("pass") pass = c.String("pass")
b, err := ioutil.ReadFile(pass) b, err := os.ReadFile(pass)
if err == nil { if err == nil {
pass = strings.TrimSpace(string(b)) pass = strings.TrimSpace(string(b))
} }
@ -213,7 +212,7 @@ func send(c *cli.Context) (err error) {
} else if crocOptions.RelayAddress6 != models.DEFAULT_RELAY6 { } else if crocOptions.RelayAddress6 != models.DEFAULT_RELAY6 {
crocOptions.RelayAddress = "" crocOptions.RelayAddress = ""
} }
b, errOpen := ioutil.ReadFile(getConfigFile()) b, errOpen := os.ReadFile(getConfigFile())
if errOpen == nil && !c.Bool("remember") { if errOpen == nil && !c.Bool("remember") {
var rememberedOptions croc.Options var rememberedOptions croc.Options
err = json.Unmarshal(b, &rememberedOptions) err = json.Unmarshal(b, &rememberedOptions)
@ -310,7 +309,7 @@ func send(c *cli.Context) (err error) {
} }
func getStdin() (fnames []string, err error) { func getStdin() (fnames []string, err error) {
f, err := ioutil.TempFile(".", "croc-stdin-") f, err := os.CreateTemp(".", "croc-stdin-")
if err != nil { if err != nil {
return return
} }
@ -327,7 +326,7 @@ func getStdin() (fnames []string, err error) {
} }
func makeTempFileWithString(s string) (fnames []string, err error) { func makeTempFileWithString(s string) (fnames []string, err error) {
f, err := ioutil.TempFile(".", "croc-stdin-") f, err := os.CreateTemp(".", "croc-stdin-")
if err != nil { if err != nil {
return return
} }
@ -401,7 +400,7 @@ func saveConfig(c *cli.Context, crocOptions croc.Options) {
log.Error(err) log.Error(err)
return return
} }
err = ioutil.WriteFile(configFile, bConfig, 0644) err = os.WriteFile(configFile, bConfig, 0644)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
return return
@ -451,7 +450,7 @@ func receive(c *cli.Context) (err error) {
return return
} }
configFile = path.Join(configFile, "receive.json") configFile = path.Join(configFile, "receive.json")
b, errOpen := ioutil.ReadFile(configFile) b, errOpen := os.ReadFile(configFile)
if errOpen == nil && !c.Bool("remember") { if errOpen == nil && !c.Bool("remember") {
var rememberedOptions croc.Options var rememberedOptions croc.Options
err = json.Unmarshal(b, &rememberedOptions) err = json.Unmarshal(b, &rememberedOptions)
@ -509,7 +508,7 @@ func receive(c *cli.Context) (err error) {
log.Error(err) log.Error(err)
return return
} }
err = ioutil.WriteFile(configFile, bConfig, 0644) err = os.WriteFile(configFile, bConfig, 0644)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
return return

View file

@ -7,7 +7,6 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"math" "math"
"net" "net"
"os" "os"
@ -1482,7 +1481,7 @@ func (c *Client) receiveData(i int) {
c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderRemote, c.FilesToTransfer[c.FilesToTransferCurrentNum].FolderRemote,
c.FilesToTransfer[c.FilesToTransferCurrentNum].Name, c.FilesToTransfer[c.FilesToTransferCurrentNum].Name,
) )
b, _ := ioutil.ReadFile(pathToFile) b, _ := os.ReadFile(pathToFile)
fmt.Print(string(b)) fmt.Print(string(b))
} }
log.Debug("sending close-sender") log.Debug("sending close-sender")

View file

@ -1,7 +1,6 @@
package croc package croc
import ( import (
"io/ioutil"
"os" "os"
"sync" "sync"
"testing" "testing"
@ -153,7 +152,7 @@ func TestCrocLocal(t *testing.T) {
func TestCrocError(t *testing.T) { func TestCrocError(t *testing.T) {
content := []byte("temporary file's content") content := []byte("temporary file's content")
tmpfile, err := ioutil.TempFile("", "example") tmpfile, err := os.CreateTemp("", "example")
if err != nil { if err != nil {
panic(err) panic(err)
} }

View file

@ -2,7 +2,6 @@ package main
import ( import (
"fmt" "fmt"
"io/ioutil"
"os" "os"
"os/exec" "os/exec"
"strings" "strings"
@ -43,7 +42,7 @@ func run() (err error) {
} }
func replaceInFile(fname, start, end, replacement string) (err error) { func replaceInFile(fname, start, end, replacement string) (err error) {
b, err := ioutil.ReadFile(fname) b, err := os.ReadFile(fname)
if err != nil { if err != nil {
return return
} }
@ -58,7 +57,7 @@ func replaceInFile(fname, start, end, replacement string) (err error) {
fmt.Sprintf("%s%s%s", start, replacement, end), fmt.Sprintf("%s%s%s", start, replacement, end),
1, 1,
) )
err = ioutil.WriteFile(fname, []byte(newF), 0644) err = os.WriteFile(fname, []byte(newF), 0644)
return return
} }

View file

@ -9,7 +9,6 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"io" "io"
"io/ioutil"
"log" "log"
"math" "math"
"math/big" "math/big"
@ -136,7 +135,7 @@ func PublicIP() (ip string, err error) {
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode == http.StatusOK { if resp.StatusCode == http.StatusOK {
bodyBytes, err := ioutil.ReadAll(resp.Body) bodyBytes, err := io.ReadAll(resp.Body)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -283,7 +282,7 @@ func GetLocalIPs() (ips []string, err error) {
} }
func RandomFileName() (fname string, err error) { func RandomFileName() (fname string, err error) {
f, err := ioutil.TempFile(".", "croc-stdin-") f, err := os.CreateTemp(".", "croc-stdin-")
if err != nil { if err != nil {
return return
} }

View file

@ -3,7 +3,6 @@ package utils
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"io/ioutil"
"log" "log"
"math/rand" "math/rand"
"os" "os"
@ -17,7 +16,7 @@ import (
var bigFileSize = 75000000 var bigFileSize = 75000000
func bigFile() { func bigFile() {
ioutil.WriteFile("bigfile.test", bytes.Repeat([]byte("z"), bigFileSize), 0666) os.WriteFile("bigfile.test", bytes.Repeat([]byte("z"), bigFileSize), 0666)
} }
func BenchmarkMD5(b *testing.B) { func BenchmarkMD5(b *testing.B) {
@ -119,7 +118,7 @@ func TestMissingChunks(t *testing.T) {
rand.Seed(1) rand.Seed(1)
bigBuff := make([]byte, fileSize) bigBuff := make([]byte, fileSize)
rand.Read(bigBuff) rand.Read(bigBuff)
ioutil.WriteFile("missing.test", bigBuff, 0644) os.WriteFile("missing.test", bigBuff, 0644)
empty := make([]byte, chunkSize) empty := make([]byte, chunkSize)
f, err := os.OpenFile("missing.test", os.O_RDWR, 0644) f, err := os.OpenFile("missing.test", os.O_RDWR, 0644)
assert.Nil(t, err) assert.Nil(t, err)
@ -139,7 +138,7 @@ func TestMissingChunks(t *testing.T) {
os.Remove("missing.test") os.Remove("missing.test")
content := []byte("temporary file's content") content := []byte("temporary file's content")
tmpfile, err := ioutil.TempFile("", "example") tmpfile, err := os.CreateTemp("", "example")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
@ -171,7 +170,7 @@ func TestMissingChunks(t *testing.T) {
func TestHashFile(t *testing.T) { func TestHashFile(t *testing.T) {
content := []byte("temporary file's content") content := []byte("temporary file's content")
tmpfile, err := ioutil.TempFile("", "example") tmpfile, err := os.CreateTemp("", "example")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }