Skip to content

Commit 10f9ad1

Browse files
authored
Merge pull request #302 from slonopotamus/copy_irregular_error
Improve error reporting in `copyIrregular`
2 parents 359b320 + 66231a3 commit 10f9ad1

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

fs/copy_irregular_freebsd.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,10 @@ func copyIrregular(dst string, fi os.FileInfo) error {
3232
if fi.Mode()&os.ModeDevice == os.ModeDevice {
3333
rDev = st.Rdev
3434
}
35-
return syscall.Mknod(dst, uint32(st.Mode), rDev)
35+
36+
if err := syscall.Mknod(dst, uint32(st.Mode), rDev); err != nil {
37+
return fmt.Errorf("failed to mknod %q: %w", dst, err)
38+
}
39+
40+
return nil
3641
}

fs/copy_irregular_unix.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ func copyIrregular(dst string, fi os.FileInfo) error {
3434
if fi.Mode()&os.ModeDevice == os.ModeDevice {
3535
rDev = int(st.Rdev)
3636
}
37+
3738
//nolint:unconvert
38-
return syscall.Mknod(dst, uint32(st.Mode), rDev)
39+
if err := syscall.Mknod(dst, uint32(st.Mode), rDev); err != nil {
40+
return fmt.Errorf("failed to mknod %q: %w", dst, err)
41+
}
42+
43+
return nil
3944
}

0 commit comments

Comments
 (0)