TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-12-02 13:52:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't shadow builtins

Browse Source
This commit is contained in:
Michael Eischer
2023-05-18 18:11:26 +02:00
parent 7a01bd3b67
commit 2fa8b96843
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/selfupdate/download.go
View File

@@ -68,21 +68,21 @@ func extractToFile(buf []byte, filename, target string, printf func(string, ...i
// Write everything to a temp file
dir := filepath.Dir(target)
new, err := os.CreateTemp(dir, "restic")
newFile, err := os.CreateTemp(dir, "restic")
if err != nil {
return err
}
n, err := io.Copy(new, rd)
n, err := io.Copy(newFile, rd)
if err != nil {
_ = new.Close()
_ = os.Remove(new.Name())
_ = newFile.Close()
_ = os.Remove(newFile.Name())
return err
}
if err = new.Sync(); err != nil {
if err = newFile.Sync(); err != nil {
return err
}
if err = new.Close(); err != nil {
if err = newFile.Close(); err != nil {
return err
}
@@ -98,7 +98,7 @@ func extractToFile(buf []byte, filename, target string, printf func(string, ...i
}
// Rename the temp file to the final location atomically.
if err := os.Rename(new.Name(), target); err != nil {
if err := os.Rename(newFile.Name(), target); err != nil {
return err
}