From f3c48ec584707a9acaf9d79c2e161dadf1d2c99b Mon Sep 17 00:00:00 2001
From: "Guillaume J. Charmes" <guillaume.charmes@dotcloud.com>
Date: Wed, 19 Feb 2014 16:50:10 -0800
Subject: [PATCH] OSX compilation

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@dotcloud.com> (github: creack)
---
 pkg/libcontainer/nsinit/exec.go  |  2 ++
 pkg/libcontainer/nsinit/init.go  |  2 ++
 pkg/libcontainer/nsinit/main.go  | 13 +++++++++++++
 pkg/libcontainer/nsinit/mount.go |  2 ++
 4 files changed, 19 insertions(+)

diff --git a/pkg/libcontainer/nsinit/exec.go b/pkg/libcontainer/nsinit/exec.go
index 4ac070db08..5b53be259c 100644
--- a/pkg/libcontainer/nsinit/exec.go
+++ b/pkg/libcontainer/nsinit/exec.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (
diff --git a/pkg/libcontainer/nsinit/init.go b/pkg/libcontainer/nsinit/init.go
index 16a30812f9..1c90ecca23 100644
--- a/pkg/libcontainer/nsinit/init.go
+++ b/pkg/libcontainer/nsinit/init.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (
diff --git a/pkg/libcontainer/nsinit/main.go b/pkg/libcontainer/nsinit/main.go
index 47abcce0c5..c9f9d7bc8f 100644
--- a/pkg/libcontainer/nsinit/main.go
+++ b/pkg/libcontainer/nsinit/main.go
@@ -2,17 +2,27 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"github.com/dotcloud/docker/pkg/libcontainer"
 	"log"
 	"os"
 )
 
+var (
+	ErrUnsupported    = errors.New("Unsupported method")
+	ErrWrongArguments = errors.New("Wrong argument count")
+)
+
 func main() {
 	container, err := loadContainer()
 	if err != nil {
 		log.Fatal(err)
 	}
 
+	argc := len(os.Args)
+	if argc < 2 {
+		log.Fatal(ErrWrongArguments)
+	}
 	switch os.Args[1] {
 	case "exec":
 		exitCode, err := execCommand(container)
@@ -21,6 +31,9 @@ func main() {
 		}
 		os.Exit(exitCode)
 	case "init":
+		if argc != 3 {
+			log.Fatal(ErrWrongArguments)
+		}
 		if err := initCommand(container, os.Args[2]); err != nil {
 			log.Fatal(err)
 		}
diff --git a/pkg/libcontainer/nsinit/mount.go b/pkg/libcontainer/nsinit/mount.go
index 13ee13e001..baa850f0fb 100644
--- a/pkg/libcontainer/nsinit/mount.go
+++ b/pkg/libcontainer/nsinit/mount.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package main
 
 import (