Compile on Windows

context.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"syscall"
 
 	"github.com/opencontainers/go-digest"
 )
@@ -115,19 +114,12 @@ func (c *context) Resource(p string, fi os.FileInfo) (Resource, error) {
 		}
 	}
 
-	// TODO(stevvooe): This need to be resolved for the container's root,
-	// where here we are really getting the host OS's value. We need to allow
-	// this be passed in and fixed up to make these uid/gid mappings portable.
-	// Either this can be part of the driver or we can achieve it through some
-	// other mechanism.
-	sys, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		// TODO(stevvooe): This may not be a hard error for all platforms. We
-		// may want to move this to the driver.
-		return nil, fmt.Errorf("unable to resolve syscall.Stat_t from (os.FileInfo).Sys(): %#v", fi)
+	uid, gid, err := getUidGidFromFileInfo(fi)
+	if err != nil {
+		return nil, err
 	}
 
-	base, err := newBaseResource(p, fi.Mode(), fmt.Sprint(sys.Uid), fmt.Sprint(sys.Gid))
+	base, err := newBaseResource(p, fi.Mode(), fmt.Sprint(uid), fmt.Sprint(gid))
 	if err != nil {
 		return nil, err
 	}

context_unix.go

@@ -0,0 +1,26 @@
+// +build linux darwin
+
+package continuity
+
+import (
+	"fmt"
+	"os"
+	"syscall"
+)
+
+// getUidGidFromFileInfo extracts the user and group IDs from a fileinfo.
+// This is Unix-specific functionality.
+func getUidGidFromFileInfo(fi os.FileInfo) (uint32, uint32, error) {
+	// TODO(stevvooe): This need to be resolved for the container's root,
+	// where here we are really getting the host OS's value. We need to allow
+	// this be passed in and fixed up to make these uid/gid mappings portable.
+	// Either this can be part of the driver or we can achieve it through some
+	// other mechanism.
+	sys, ok := fi.Sys().(*syscall.Stat_t)
+	if !ok {
+		// TODO(stevvooe): This may not be a hard error for all platforms. We
+		// may want to move this to the driver.
+		return 0, 0, fmt.Errorf("unable to resolve syscall.Stat_t from (os.FileInfo).Sys(): %#v", fi)
+	}
+	return sys.Uid, sys.Gid, nil
+}

context_windows.go

@@ -0,0 +1,9 @@
+package continuity
+
+import "os"
+
+// getUidGidFromFileInfo extracts the user and group IDs from a fileinfo.
+// This is Unix-specific functionality.
+func getUidGidFromFileInfo(fi os.FileInfo) (uint32, uint32, error) {
+	return 0, 0, nil
+}

driver.go

@@ -1,7 +1,6 @@
 package continuity
 
 import (
-	"errors"
 	"os"
 	"strconv"
 )
@@ -144,15 +143,6 @@ func (d *driver) Symlink(oldname, newname string) error {
 	return os.Symlink(oldname, newname)
 }
 
-func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
-	return mknod(path, mode, major, minor)
-}
-
-func (d *driver) Mkfifo(path string, mode os.FileMode) error {
-	if mode&os.ModeNamedPipe == 0 {
-		return errors.New("mode passed to Mkfifo does not have the named pipe bit set")
-	}
-	// mknod with a mode that has ModeNamedPipe set creates a fifo, not a
-	// device.
-	return mknod(path, mode, 0, 0)
+func (d *driver) DeviceInfo(fi os.FileInfo) (maj uint64, min uint64, err error) {
+	return deviceInfo(fi)
 }

driver_unix.go

@@ -3,6 +3,7 @@
 package continuity
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -102,6 +103,15 @@ func (d *driver) LSetxattr(path string, attrMap map[string][]byte) error {
 	return nil
 }
 
-func (d *driver) DeviceInfo(fi os.FileInfo) (maj uint64, min uint64, err error) {
-	return deviceInfo(fi)
+func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
+	return mknod(path, mode, major, minor)
+}
+
+func (d *driver) Mkfifo(path string, mode os.FileMode) error {
+	if mode&os.ModeNamedPipe == 0 {
+		return errors.New("mode passed to Mkfifo does not have the named pipe bit set")
+	}
+	// mknod with a mode that has ModeNamedPipe set creates a fifo, not a
+	// device.
+	return mknod(path, mode, 0, 0)
 }

driver_windows.go

@@ -0,0 +1,30 @@
+package continuity
+
+import (
+	"fmt"
+	"os"
+)
+
+var (
+	errdeviceInfoNotImplemented = fmt.Errorf("deviceInfo not implemented on Windows")
+	errLchmodNotImplemented     = fmt.Errorf("Lchmod not implemented on Windows")
+	errMknodNotImplemented      = fmt.Errorf("Mknod not implemented on Windows")
+	errMkfifoNotImplemented     = fmt.Errorf("Mkfifo not implemented on Windows")
+)
+
+func deviceInfo(fi os.FileInfo) (maj uint64, min uint64, err error) {
+	return 0, 0, errdeviceInfoNotImplemented
+}
+
+// Lchmod changes the mode of an file not following symlinks.
+func (d *driver) Lchmod(path string, mode os.FileMode) (err error) {
+	return errLchmodNotImplemented
+}
+
+func (d *driver) Mknod(path string, mode os.FileMode, major, minor int) error {
+	return errMknodNotImplemented
+}
+
+func (d *driver) Mkfifo(path string, mode os.FileMode) error {
+	return errMkfifoNotImplemented
+}

groups_unix.go

@@ -1,3 +1,5 @@
+// +build linux darwin
+
 package continuity
 
 import (

hardlinks.go

@@ -6,7 +6,8 @@ import (
 )
 
 var (
-	errNotAHardLink = fmt.Errorf("invalid hardlink")
+	errNotAHardLink           = fmt.Errorf("invalid hardlink")
+	errNotHardLinkImplemented = fmt.Errorf("hardlink not implemented")
 )
 
 type hardlinkManager struct {

hardlinks_unix.go

@@ -1,3 +1,5 @@
+// +build linux darwin
+
 package continuity
 
 import (

hardlinks_windows.go

@@ -1,5 +1,19 @@
 package continuity
 
+import "os"
+
 // NOTE(stevvooe): Obviously, this is not yet implemented. However, the
 // makings of an implementation are available in src/os/types_windows.go. More
 // investigation needs to be done to figure out exactly how to do this.
+
+// hardlinkKey provides a tuple-key for managing hardlinks. This is system-
+// specific.
+type hardlinkKey struct {
+}
+
+// newHardlinkKey returns a hardlink key for the provided file info. If the
+// resource does not represent a possible hardlink, errNotAHardLink will be
+// returned.
+func newHardlinkKey(fi os.FileInfo) (hardlinkKey, error) {
+	return hardlinkKey{}, errNotHardLinkImplemented
+}