Merge pull request #365 from jbenet/windows-hotfixes

Windows Hotfixes

commands/cli/parse.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	fp "path/filepath"
+	"runtime"
 	"strings"
 
 	cmds "github.com/jbenet/go-ipfs/commands"
@@ -138,6 +139,11 @@ func parseOptions(input []string) (map[string]interface{}, []string, error) {
 }
 
 func parseArgs(inputs []string, stdin *os.File, argDefs []cmds.Argument, recursive bool) ([]string, []cmds.File, error) {
+	// ignore stdin on Windows
+	if runtime.GOOS == "windows" {
+		stdin = nil
+	}
+
 	// check if stdin is coming from terminal or is being piped in
 	if stdin != nil {
 		if term, err := isTerminal(stdin); err != nil {

core/commands/mount_windows.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	cmds "github.com/jbenet/go-ipfs/commands"
+	"github.com/jbenet/go-ipfs/core"
 )
 
 var mountCmd = &cmds.Command{
@@ -16,3 +17,9 @@ var mountCmd = &cmds.Command{
 		return errors.New("Mount isn't compatible with Windows yet"), nil
 	},
 }
+
+func Mount(node *core.IpfsNode, fsdir, nsdir string) error {
+	// TODO
+	// currently a no-op, but we don't want to return an error
+	return nil
+}