Merge pull request #123 from kolyshkin/path-error

dmcgowan · web-flow · commit 508d86ade3c2 · 2018-09-19T12:03:52.000-07:00
driver/{Mknod,Mkfifo,Lchmod}: return PathError
diff --git a/driver/driver_unix.go b/driver/driver_unix.go
@@ -29,7 +29,11 @@ import (
 )
 
 func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
-	return devices.Mknod(path, mode, major, minor)
+	err := devices.Mknod(path, mode, major, minor)
+	if err != nil {
+		err = &os.PathError{Op: "mknod", Path: path, Err: err}
+	}
+	return err
 }
 
 func (d *driver) Mkfifo(path string, mode os.FileMode) error {
@@ -38,7 +42,11 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {
 	}
 	// mknod with a mode that has ModeNamedPipe set creates a fifo, not a
 	// device.
-	return devices.Mknod(path, mode, 0, 0)
+	err := devices.Mknod(path, mode, 0, 0)
+	if err != nil {
+		err = &os.PathError{Op: "mkfifo", Path: path, Err: err}
+	}
+	return err
 }
 
 // Getxattr returns all of the extended attributes for the file at path p.
diff --git a/driver/driver_windows.go b/driver/driver_windows.go
@@ -20,15 +20,14 @@ import (
 	"os"
 
 	"github.com/containerd/continuity/sysx"
-	"github.com/pkg/errors"
 )
 
 func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
-	return errors.Wrap(ErrNotSupported, "cannot create device node on Windows")
+	return &os.PathError{Op: "mknod", Path: path, Err: ErrNotSupported}
 }
 
 func (d *driver) Mkfifo(path string, mode os.FileMode) error {
-	return errors.Wrap(ErrNotSupported, "cannot create fifo on Windows")
+	return &os.PathError{Op: "mkfifo", Path: path, Err: ErrNotSupported}
 }
 
 // Lchmod changes the mode of an file not following symlinks.
diff --git a/driver/lchmod_linux.go b/driver/lchmod_linux.go
@@ -31,5 +31,9 @@ func (d *driver) Lchmod(path string, mode os.FileMode) error {
 		return nil
 	}
 
-	return unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)
+	err := unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)
+	if err != nil {
+		err = &os.PathError{Op: "lchmod", Path: path, Err: err}
+	}
+	return err
 }
diff --git a/driver/lchmod_unix.go b/driver/lchmod_unix.go
@@ -26,5 +26,9 @@ import (
 
 // Lchmod changes the mode of a file not following symlinks.
 func (d *driver) Lchmod(path string, mode os.FileMode) error {
-	return unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), unix.AT_SYMLINK_NOFOLLOW)
+	err := unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), unix.AT_SYMLINK_NOFOLLOW)
+	if err != nil {
+		err = &os.PathError{Op: "lchmod", Path: path, Err: err}
+	}
+	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ import (`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {`
`32`		`- return devices.Mknod(path, mode, major, minor)`
	`32`	`+ err := devices.Mknod(path, mode, major, minor)`
	`33`	`+ if err != nil {`
	`34`	`+ err = &os.PathError{Op: "mknod", Path: path, Err: err}`
	`35`	`+ }`
	`36`	`+ return err`
`33`	`37`	`}`
`34`	`38`
`35`	`39`	`func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`@@ -38,7 +42,11 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`38`	`42`	`}`
`39`	`43`	`// mknod with a mode that has ModeNamedPipe set creates a fifo, not a`
`40`	`44`	`// device.`
`41`		`- return devices.Mknod(path, mode, 0, 0)`
	`45`	`+ err := devices.Mknod(path, mode, 0, 0)`
	`46`	`+ if err != nil {`
	`47`	`+ err = &os.PathError{Op: "mkfifo", Path: path, Err: err}`
	`48`	`+ }`
	`49`	`+ return err`
`42`	`50`	`}`
`43`	`51`
`44`	`52`	`// Getxattr returns all of the extended attributes for the file at path p.`
Original file line number	Diff line number	Diff line change
`@@ -20,15 +20,14 @@ import (`
`20`	`20`	`"os"`
`21`	`21`
`22`	`22`	`"github.com/containerd/continuity/sysx"`
`23`		`- "github.com/pkg/errors"`
`24`	`23`	`)`
`25`	`24`
`26`	`25`	`func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {`
`27`		`- return errors.Wrap(ErrNotSupported, "cannot create device node on Windows")`
	`26`	`+ return &os.PathError{Op: "mknod", Path: path, Err: ErrNotSupported}`
`28`	`27`	`}`
`29`	`28`
`30`	`29`	`func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`31`		`- return errors.Wrap(ErrNotSupported, "cannot create fifo on Windows")`
	`30`	`+ return &os.PathError{Op: "mkfifo", Path: path, Err: ErrNotSupported}`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`// Lchmod changes the mode of an file not following symlinks.`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,9 @@ func (d *driver) Lchmod(path string, mode os.FileMode) error {`
`31`	`31`	`return nil`
`32`	`32`	`}`
`33`	`33`
`34`		`- return unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)`
	`34`	`+ err := unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)`
	`35`	`+ if err != nil {`
	`36`	`+ err = &os.PathError{Op: "lchmod", Path: path, Err: err}`
	`37`	`+ }`
	`38`	`+ return err`
`35`	`39`	`}`