mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 08:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

change the atomic write functions to work with readers

Browse Source
This commit is contained in:
Kovid Goyal
2024-07-22 15:01:19 +05:30
parent d31c48092a
commit c906314974
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/utils/atomic-write.go
View File

@@ -5,6 +5,7 @@ package utils
import (
"errors"
"fmt"
"io"
"io/fs"
"os"
"path/filepath"
@@ -39,7 +40,7 @@ func AtomicCreateSymlink(oldname, newname string) (err error) {
}
}
func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) {
func AtomicWriteFile(path string, data io.Reader, perm os.FileMode) (err error) {
npath, err := filepath.EvalSymlinks(path)
if errors.Is(err, fs.ErrNotExist) {
err = nil
@@ -60,7 +61,7 @@ func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) {
removed = true
}
}()
_, err = f.Write(data)
_, err = io.Copy(f, data)
if err == nil {
err = f.Chmod(perm)
if err == nil {
@@ -76,7 +77,7 @@ func AtomicWriteFile(path string, data []byte, perm os.FileMode) (err error) {
return
}
func AtomicUpdateFile(path string, data []byte, perms ...fs.FileMode) (err error) {
func AtomicUpdateFile(path string, data io.Reader, perms ...fs.FileMode) (err error) {
perm := fs.FileMode(0o644)
if len(perms) > 0 {
perm = perms[0]

3
tools/utils/cached_values.go
View File

@@ -3,6 +3,7 @@
package utils
import (
"bytes"
"encoding/json"
"fmt"
"os"
@@ -31,7 +32,7 @@ func (self *CachedValues[T]) Load() T {
func (self *CachedValues[T]) Save() {
raw, err := json.Marshal(self.Opts)
if err == nil {
AtomicUpdateFile(self.Path(), raw, 0o600)
AtomicUpdateFile(self.Path(), bytes.NewReader(raw), 0o600)
}
}