driver/{Mknod,Mkfifo,Lchmod}: return PathError

kolyshkin · kolyshkin · commit f5b895a5f9b5 · 2018-08-27T18:59:25.000-07:00
In case any of these methods fail, make sure to return an error wrapped
in os.PathError, to be in line with the other methods (most of which are
wrappers for os.Foo() calls, which return os.PathError or os.LinkError).

[v2: use keyed fields]

Signed-off-by: Kir Kolyshkin &lt;kolyshkin@gmail.com&gt;
diff --git a/driver/driver_unix.go b/driver/driver_unix.go
@@ -13,7 +13,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 {
@@ -22,7 +26,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
@@ -4,15 +4,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
@@ -15,5 +15,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
@@ -10,5 +10,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
`@@ -13,7 +13,11 @@ import (`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {`
`16`		`- return devices.Mknod(path, mode, major, minor)`
	`16`	`+ err := devices.Mknod(path, mode, major, minor)`
	`17`	`+ if err != nil {`
	`18`	`+ err = &os.PathError{Op: "mknod", Path: path, Err: err}`
	`19`	`+ }`
	`20`	`+ return err`
`17`	`21`	`}`
`18`	`22`
`19`	`23`	`func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`@@ -22,7 +26,11 @@ func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`22`	`26`	`}`
`23`	`27`	`// mknod with a mode that has ModeNamedPipe set creates a fifo, not a`
`24`	`28`	`// device.`
`25`		`- return devices.Mknod(path, mode, 0, 0)`
	`29`	`+ err := devices.Mknod(path, mode, 0, 0)`
	`30`	`+ if err != nil {`
	`31`	`+ err = &os.PathError{Op: "mkfifo", Path: path, Err: err}`
	`32`	`+ }`
	`33`	`+ return err`
`26`	`34`	`}`
`27`	`35`
`28`	`36`	`// Getxattr returns all of the extended attributes for the file at path p.`
Original file line number	Diff line number	Diff line change
`@@ -4,15 +4,14 @@ import (`
`4`	`4`	`"os"`
`5`	`5`
`6`	`6`	`"github.com/containerd/continuity/sysx"`
`7`		`- "github.com/pkg/errors"`
`8`	`7`	`)`
`9`	`8`
`10`	`9`	`func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {`
`11`		`- return errors.Wrap(ErrNotSupported, "cannot create device node on Windows")`
	`10`	`+ return &os.PathError{Op: "mknod", Path: path, Err: ErrNotSupported}`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`func (d *driver) Mkfifo(path string, mode os.FileMode) error {`
`15`		`- return errors.Wrap(ErrNotSupported, "cannot create fifo on Windows")`
	`14`	`+ return &os.PathError{Op: "mkfifo", Path: path, Err: ErrNotSupported}`
`16`	`15`	`}`
`17`	`16`
`18`	`17`	`// Lchmod changes the mode of an file not following symlinks.`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,9 @@ func (d *driver) Lchmod(path string, mode os.FileMode) error {`
`15`	`15`	`return nil`
`16`	`16`	`}`
`17`	`17`
`18`		`- return unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)`
	`18`	`+ err := unix.Fchmodat(unix.AT_FDCWD, path, uint32(mode), 0)`
	`19`	`+ if err != nil {`
	`20`	`+ err = &os.PathError{Op: "lchmod", Path: path, Err: err}`
	`21`	`+ }`
	`22`	`+ return err`
`19`	`23`	`}`