Use os.CreateTemp with os.Chmod afterwards

diff --git a/main.go b/main.go
index bfebadfcf5501ff9f7c547adbdb145bb4c298a3f..8791af0d41175759dc5fa7f9a1fc78beea1954e1 100644 (file)
--- a/main.go
+++ b/main.go
@@ -62,6 +62,7 @@ var (
        Cwd       string
        BuildUUID string
        IsTopRedo bool // is it the top redo instance
+       UmaskCur  int
 )
 
 func mustSetenv(key string) {
@@ -134,6 +135,9 @@ func main() {
        }
        log.SetFlags(log.Lshortfile)
 
+       UmaskCur = syscall.Umask(0)
+       syscall.Umask(UmaskCur)
+
        var err error
        Cwd, err = os.Getwd()
        if err != nil {

diff --git a/tmp.go b/tmp.go
index 1d8a3f29d3d97d923da14eed030610014fb0d28f..45bf32d1583fe5d82adda7316a62874aa095155a 100644 (file)
--- a/tmp.go
+++ b/tmp.go
@@ -21,7 +21,6 @@ package main
 
 import (
        "os"
-       "path"
        "strconv"
        "time"
 )
@@ -31,7 +30,14 @@ func tempsuffix() string {
 }
 
 func tempfile(dir, prefix string) (*os.File, error) {
-       // It respects umask, unlike ioutil.TempFile
-       name := path.Join(dir, TmpPrefix+prefix+"."+tempsuffix())
-       return os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, os.FileMode(0666))
+       tmp, err := os.CreateTemp(dir, prefix)
+       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
 }