github/zyedidia.micro
2
0
Fork 0
mirror of https://github.com/zyedidia/micro.git synced 2026-03-17 22:37:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3814 from JoeKar/fix/sudo-save

Browse Source 
save: Use `dd` with the `notrunc` & `fsync` and postpone truncation
This commit is contained in:
Jöran Karl
2025-08-12 19:37:16 +02:00
committed by GitHub
parent bce573b6c9 165a5a4896
commit 1dbb058773
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
internal/buffer/save.go
View File

@@ -25,6 +25,7 @@ import (
const LargeFileThreshold = 50000
type wrappedFile struct {
name string
writeCloser io.WriteCloser
withSudo bool
screenb bool
@@ -81,7 +82,13 @@ func openFile(name string, withSudo bool) (wrappedFile, error) {
var sigChan chan os.Signal
if withSudo {
cmd = exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "of="+name)
conv := "notrunc"
// TODO: both platforms do not support dd with conv=fsync yet
if !(runtime.GOOS == "illumos" || runtime.GOOS == "netbsd") {
conv += ",fsync"
}
cmd = exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "bs=4k", "conv="+conv, "of="+name)
writeCloser, err = cmd.StdinPipe()
if err != nil {
return wrappedFile{}, err
@@ -111,7 +118,18 @@ func openFile(name string, withSudo bool) (wrappedFile, error) {
}
}
return wrappedFile{writeCloser, withSudo, screenb, cmd, sigChan}, nil
return wrappedFile{name, writeCloser, withSudo, screenb, cmd, sigChan}, nil
}
func (wf wrappedFile) Truncate() error {
if wf.withSudo {
// we don't need to stop the screen here, since it is still stopped
// by openFile()
// truncate might not be available on every platfom, so use dd instead
cmd := exec.Command(config.GlobalSettings["sucmd"].(string), "dd", "count=0", "of="+wf.name)
return cmd.Run()
}
return wf.writeCloser.(*os.File).Truncate(0)
}
func (wf wrappedFile) Write(b *SharedBuffer) (int, error) {
@@ -132,12 +150,9 @@ func (wf wrappedFile) Write(b *SharedBuffer) (int, error) {
eol = []byte{'\n'}
}
if !wf.withSudo {
f := wf.writeCloser.(*os.File)
err := f.Truncate(0)
if err != nil {
return 0, err
}
err := wf.Truncate()
if err != nil {
return 0, err
}
// write lines
@@ -349,7 +364,6 @@ func (b *SharedBuffer) safeWrite(path string, withSudo bool, newFile bool) (int,
}
}()
// Try to backup first before writing
backupName, err := b.writeBackup(path)
if err != nil {