Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fileutils: Use ModeType as the mask for mode checks #3

Merged
merged 1 commit into from
May 4, 2020
Merged

fileutils: Use ModeType as the mask for mode checks #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions fileutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ func CopyFile(source string, dest string) error {

uid := int(st.Uid)
gid := int(st.Gid)
modeType := si.Mode()&os.ModeType

// Handle symlinks
if si.Mode()&os.ModeSymlink != 0 {
if modeType == os.ModeSymlink {
target, err := os.Readlink(source)
if err != nil {
return err
Expand All @@ -35,15 +36,14 @@ func CopyFile(source string, dest string) error {
}

// Handle device files
if st.Mode&syscall.S_IFMT == syscall.S_IFBLK || st.Mode&syscall.S_IFMT == syscall.S_IFCHR {
if modeType == os.ModeDevice {
devMajor := int64(major(uint64(st.Rdev)))
devMinor := int64(minor(uint64(st.Rdev)))
mode := uint32(si.Mode() & 07777)
if st.Mode&syscall.S_IFMT == syscall.S_IFBLK {
mode |= syscall.S_IFBLK
}
if st.Mode&syscall.S_IFMT == syscall.S_IFCHR {
mode := uint32(si.Mode() & os.ModePerm)
if si.Mode()&os.ModeCharDevice != 0 {
mode |= syscall.S_IFCHR
} else {
mode |= syscall.S_IFBLK
}
if err := syscall.Mknod(dest, mode, int(mkdev(devMajor, devMinor))); err != nil {
return err
Expand Down Expand Up @@ -76,7 +76,7 @@ func CopyFile(source string, dest string) error {
}

// Chmod the file
if !(si.Mode()&os.ModeSymlink == os.ModeSymlink) {
if !(modeType == os.ModeSymlink) {
if err := os.Chmod(dest, si.Mode()); err != nil {
return err
}
Expand Down