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

Remove use of syscall package for flock

Browse Source 
It is provided by unix package these days
This commit is contained in:
Kovid Goyal
2024-07-09 08:24:57 +05:30
parent ee7afeea5a
commit e45d518082
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/utils/filelock.go
View File

@@ -3,27 +3,29 @@
package utils package utils
import ( import (
"errors"
"fmt" "fmt"
"io/fs" "io/fs"
"os" "os"
"syscall"
"golang.org/x/sys/unix"
) )
var _ = fmt.Print var _ = fmt.Print
func lock(fd, op int, path string) (err error) { func lock(fd, op int, path string) (err error) {
for { for {
err = syscall.Flock(fd, op) err = unix.Flock(fd, op)
if err != syscall.EINTR { if !errors.Is(err, unix.EINTR) {
break break
} }
} }
if err != nil { if err != nil {
opname := "exclusive flock()" opname := "exclusive flock()"
switch op { switch op {
case syscall.LOCK_UN: case unix.LOCK_UN:
opname = "unlock flock()" opname = "unlock flock()"
case syscall.LOCK_SH: case unix.LOCK_SH:
opname = "shared flock()" opname = "shared flock()"
} }
return &fs.PathError{ return &fs.PathError{
@@ -36,13 +38,13 @@ func lock(fd, op int, path string) (err error) {
} }
func LockFileShared(f *os.File) error { func LockFileShared(f *os.File) error {
return lock(int(f.Fd()), syscall.LOCK_SH, f.Name()) return lock(int(f.Fd()), unix.LOCK_SH, f.Name())
} }
func LockFileExclusive(f *os.File) error { func LockFileExclusive(f *os.File) error {
return lock(int(f.Fd()), syscall.LOCK_EX, f.Name()) return lock(int(f.Fd()), unix.LOCK_EX, f.Name())
} }
func UnlockFile(f *os.File) error { func UnlockFile(f *os.File) error {
return lock(int(f.Fd()), syscall.LOCK_UN, f.Name()) return lock(int(f.Fd()), unix.LOCK_UN, f.Name())
} }