do not rename inuse files

522e0887 · Knic Knic · 95760fff · 522e0887
Commit 522e0887 authored Feb 21, 2020 by Knic Knic
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 9 deletions

passwd.go pkg/passwd/passwd.go +13 -9

No files found.
--- a/pkg/passwd/passwd.go
+++ b/pkg/passwd/passwd.go
@@ -133,17 +133,21 @@ func (p *Passwd) Write(passwdFile string) error {
 }
 func writePasswords(passwdFile string, records [][]string) error {
-	out, err := os.Create(passwdFile + ".tmp")
+	err := func() error {
-	if err != nil {
+		// ensure to close tmp file before rename for filesystems like NTFS
-		return err
+		out, err := os.Create(passwdFile + ".tmp")
-	}
+		if err != nil {
-	defer out.Close()
+			return err
+		}
+		defer out.Close()
-	if err := out.Chmod(0600); err != nil {
+		if err := out.Chmod(0600); err != nil {
-		return err
+			return err
-	}
+		}
-	if err := csv.NewWriter(out).WriteAll(records); err != nil {
+		return csv.NewWriter(out).WriteAll(records)
+	}()
+	if err != nil {
 		return err
 	}