util: digging UID/GID out of os.FileInfo should work on Unix

Digging the UID and GID out of an os.FileInfo should work on all Unixy
systems, so move it from Linux-specific implementation file to a file
that we also build for Darwin.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai 2020-11-05 13:44:55 -05:00
parent 0c7eff8d54
commit 962406aa36
4 changed files with 16 additions and 21 deletions

View File

@ -1,7 +1,6 @@
package util
import (
"os"
"syscall"
"golang.org/x/sys/unix"
@ -19,11 +18,3 @@ func IsCgroup2UnifiedMode() (bool, error) {
})
return isUnified, isUnifiedErr
}
func UID(st os.FileInfo) int {
return int(st.Sys().(*syscall.Stat_t).Uid)
}
func GID(st os.FileInfo) int {
return int(st.Sys().(*syscall.Stat_t).Gid)
}

View File

@ -29,3 +29,11 @@ func (h *HardlinkChecker) Add(fi os.FileInfo, name string) {
h.hardlinks.Store(makeHardlinkDeviceAndInode(st), name)
}
}
func UID(st os.FileInfo) int {
return int(st.Sys().(*syscall.Stat_t).Uid)
}
func GID(st os.FileInfo) int {
return int(st.Sys().(*syscall.Stat_t).Gid)
}

View File

@ -2,19 +2,7 @@
package util
import (
"os"
)
// IsCgroup2UnifiedMode returns whether we are running in cgroup 2 cgroup2 mode.
func IsCgroup2UnifiedMode() (bool, error) {
return false, nil
}
func UID(st os.FileInfo) int {
return 0
}
func GID(st os.FileInfo) int {
return 0
}

View File

@ -14,3 +14,11 @@ func (h *HardlinkChecker) Check(fi os.FileInfo) string {
}
func (h *HardlinkChecker) Add(fi os.FileInfo, name string) {
}
func UID(st os.FileInfo) int {
return 0
}
func GID(st os.FileInfo) int {
return 0
}