Fix lack of .redo-prefix in temporary files

[goredo.git] / tmp.go

diff --git a/tmp.go b/tmp.go
index 1db00f6e9fd974cc4e2646367db1f2945d53c85a..f64a44f3dc7cd1706e2e65fb8dda2c83875f567e 100644 (file)
--- a/tmp.go
+++ b/tmp.go
@@ -1,6 +1,6 @@
 /*
-goredo -- redo implementation on pure Go
-Copyright (C) 2020 Sergey Matveev <stargrave@stargrave.org>
+goredo -- djb's redo implementation on pure Go
+Copyright (C) 2020-2022 Sergey Matveev <stargrave@stargrave.org>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -21,17 +21,17 @@ package main
 
 import (
        "os"
-       "path"
-       "strconv"
-       "time"
 )
 
-func tempsuffix() string {
-       return strconv.FormatInt((time.Now().UnixNano()+int64(os.Getpid()))&0xFFFFFFFF, 16)
-}
-
 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, TmpPrefix+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
 }