hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

syscallcompat: Drop Fchownat emulation on macOS.

Browse Source
This commit is contained in:
Sebastian Lackner 2019-01-14 02:49:11 +01:00 committed by rfjakob
parent 0345cc0830
commit 92110628ee
5 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
internal/syscallcompat/emulate.go
View File

@ -30,26 +30,6 @@ func emulateMknodat(dirfd int, path string, mode uint32, dev int) error {
return syscall.Mknod(path, mode, dev) return syscall.Mknod(path, mode, dev)
} }
// emulateFchownat emulates the syscall for platforms that don't have it
// in the kernel (darwin).
func emulateFchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
if !filepath.IsAbs(path) {
chdirMutex.Lock()
defer chdirMutex.Unlock()
cwd, err := syscall.Open(".", syscall.O_RDONLY, 0)
if err != nil {
return err
}
defer syscall.Close(cwd)
err = syscall.Fchdir(dirfd)
if err != nil {
return err
}
defer syscall.Fchdir(cwd)
}
return syscall.Lchown(path, uid, gid)
}
// emulateSymlinkat emulates the syscall for platforms that don't have it // emulateSymlinkat emulates the syscall for platforms that don't have it
// in the kernel (darwin). // in the kernel (darwin).
func emulateSymlinkat(oldpath string, newdirfd int, newpath string) (err error) { func emulateSymlinkat(oldpath string, newdirfd int, newpath string) (err error) {

4
internal/syscallcompat/emulate_test.go
View File

@ -29,10 +29,6 @@ func TestEmulateMknodat(t *testing.T) {
} }
} }
func TestEmulateFchownat(t *testing.T) {
t.Skipf("TODO")
}
// symlinkCheckMode looks if the mode bits in "st" say that this is a symlink. // symlinkCheckMode looks if the mode bits in "st" say that this is a symlink.
// Calls t.Fatal() if not. // Calls t.Fatal() if not.
func symlinkCheckMode(t *testing.T, st syscall.Stat_t) { func symlinkCheckMode(t *testing.T, st syscall.Stat_t) {

10
internal/syscallcompat/sys_common.go
View File

@ -72,6 +72,16 @@ func Unlinkat(dirfd int, path string, flags int) (err error) {
return unix.Unlinkat(dirfd, path, flags) return unix.Unlinkat(dirfd, path, flags)
} }
// Fchownat syscall.
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
// Why would we ever want to call this without AT_SYMLINK_NOFOLLOW?
if flags&unix.AT_SYMLINK_NOFOLLOW == 0 {
tlog.Warn.Printf("Fchownat: adding missing AT_SYMLINK_NOFOLLOW flag")
flags |= unix.AT_SYMLINK_NOFOLLOW
}
return unix.Fchownat(dirfd, path, uid, gid, flags)
}
// Linkat exists both in Linux and in MacOS 10.10+. // Linkat exists both in Linux and in MacOS 10.10+.
func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) { func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
return unix.Linkat(olddirfd, oldpath, newdirfd, newpath, flags) return unix.Linkat(olddirfd, oldpath, newdirfd, newpath, flags)

4
internal/syscallcompat/sys_darwin.go
View File

@ -102,10 +102,6 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
return unix.Fchmodat(dirfd, path, mode, flags) return unix.Fchmodat(dirfd, path, mode, flags)
} }
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
return emulateFchownat(dirfd, path, uid, gid, flags)
}
func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
return emulateSymlinkat(oldpath, newdirfd, newpath) return emulateSymlinkat(oldpath, newdirfd, newpath)
} }

10
internal/syscallcompat/sys_linux.go
View File

@ -154,16 +154,6 @@ func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
return syscall.Chmod(procPath, mode) return syscall.Chmod(procPath, mode)
} }
// Fchownat syscall.
func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
// Why would we ever want to call this without AT_SYMLINK_NOFOLLOW?
if flags&unix.AT_SYMLINK_NOFOLLOW == 0 {
tlog.Warn.Printf("Fchownat: adding missing AT_SYMLINK_NOFOLLOW flag")
flags |= unix.AT_SYMLINK_NOFOLLOW
}
return syscall.Fchownat(dirfd, path, uid, gid, flags)
}
// Symlinkat syscall. // Symlinkat syscall.
func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) { func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
return unix.Symlinkat(oldpath, newdirfd, newpath) return unix.Symlinkat(oldpath, newdirfd, newpath)