Use native os.CreateTemp instead of own one

[gocheese.git] / fileutils.go

diff --git a/fileutils.go b/fileutils.go
index 34e6e748956922fb8d7a79ac234828514d3da960..aec22c64573304de084db76bf63294facf2928e4 100644 (file)
--- a/fileutils.go
+++ b/fileutils.go
@@ -22,17 +22,25 @@ import (
        "net/http"
        "os"
        "path/filepath"
-       "strconv"
        "time"
 )
 
-var NoSync = os.Getenv("GOCHEESE_NO_SYNC") == "1"
+var (
+       NoSync   = os.Getenv("GOCHEESE_NO_SYNC") == "1"
+       UmaskCur int
+)
 
 func TempFile(dir string) (*os.File, error) {
-       // Assume that probability of suffix collision is negligible
-       suffix := strconv.FormatInt(time.Now().UnixNano()+int64(os.Getpid()), 16)
-       name := filepath.Join(dir, "nncp"+suffix)
-       return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, os.FileMode(0666))
+       tmp, err := os.CreateTemp(dir, "gocheese")
+       if err != nil {
+               return nil, err
+       }
+       err = os.Chmod(tmp.Name(), os.FileMode(0666&^UmaskCur))
+       if err != nil {
+               tmp.Close()
+               return nil, err
+       }
+       return tmp, nil
 }
 
 func DirSync(dirPath string) error {