X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=file.go;h=f382ba4ef8bdcae5100d568cdd09009fef0b33b4;hb=f976f64c4fd120a2ba9dc93a3e26463b26adbe41;hp=5b8fffef41b466d0c32182fb6f71fd7c77a64978;hpb=5f90bfd1ae2fb737d14532d74d93e3f1c1763f99;p=nsscash%2Fnsscash.git

diff --git a/file.go b/file.go
index 5b8fffe..f382ba4 100644
--- a/file.go
+++ b/file.go
@@ -1,6 +1,6 @@
 // Download and write files atomically to the file system
 
-// Copyright (C) 2019  Simon Ruderich
+// Copyright (C) 2019-2020  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU Affero General Public License as published by
@@ -30,6 +30,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/google/renameio"
 	"github.com/pkg/errors"
 )
 
@@ -164,18 +165,11 @@ func deployFile(file *File) error {
 		return fmt.Errorf("refusing to write empty file")
 	}
 
-	// Write the file in an atomic fashion by creating a temporary file
-	// and renaming it over the target file
-
-	dir := filepath.Dir(file.Path)
-	name := filepath.Base(file.Path)
-
-	f, err := ioutil.TempFile(dir, "tmp-"+name+"-")
+	f, err := renameio.TempFile(filepath.Dir(file.Path), file.Path)
 	if err != nil {
 		return err
 	}
-	defer os.Remove(f.Name())
-	defer f.Close()
+	defer f.Cleanup()
 
 	// Apply permissions/user/group from the target file but remove the
 	// write permissions to discourage manual modifications, use Stat
@@ -204,9 +198,5 @@ func deployFile(file *File) error {
 	if err != nil {
 		return err
 	}
-	err = f.Sync()
-	if err != nil {
-		return err
-	}
-	return os.Rename(f.Name(), file.Path)
+	return f.CloseAtomicallyReplace()
 }