From 4bd2fbc80664ebfd97ca64eb18f3217566adfd11 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 19 Nov 2014 04:29:45 -0800 Subject: [PATCH 1/2] commands/cli: Ignore stdin on Windows --- commands/cli/parse.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/commands/cli/parse.go b/commands/cli/parse.go index aceec578c..a5a0e0715 100644 --- a/commands/cli/parse.go +++ b/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 { From ab16237bc7d58b2b5c878fd7e873593a4bd581b9 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 19 Nov 2014 04:32:48 -0800 Subject: [PATCH 2/2] core/commands: Added no-op Mount implementation for Windows --- core/commands/mount_windows.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/commands/mount_windows.go b/core/commands/mount_windows.go index c439d7883..27b13381b 100644 --- a/core/commands/mount_windows.go +++ b/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 +}