Fixed bridge with ctx on windows

Fixes: #22

varlink/bridge.go

@@ -1,5 +1,3 @@
-// +build !windows
-
 package varlink
 
 import (
@@ -8,8 +6,6 @@ import (
 	"os"
 	"os/exec"
 	"time"
-
-	"github.com/varlink/go/varlink/internal/ctxio"
 )
 
 var _ net.Conn = &PipeCon{}
@@ -62,30 +58,6 @@ func (p PipeCon) Close() error {
 	return nil
 }
 
-// NewBridgeWithStderr returns a new connection with the given bridge.
-func NewBridgeWithStderr(bridge string, stderr io.Writer) (*Connection, error) {
-	c := Connection{}
-	cmd := exec.Command("sh", "-c", bridge)
-	cmd.Stderr = stderr
-	r, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-	w, err := cmd.StdinPipe()
-	if err != nil {
-		return nil, err
-	}
-	c.conn = ctxio.NewConn(PipeCon{cmd, r, w})
-	c.address = ""
-
-	err = cmd.Start()
-	if err != nil {
-		return nil, err
-	}
-
-	return &c, nil
-}
-
 // NewBridge returns a new connection with the given bridge.
 func NewBridge(bridge string) (*Connection, error) {
 	return NewBridgeWithStderr(bridge, os.Stderr)

varlink/newbridge.go

@@ -0,0 +1,33 @@
+// +build !windows
+
+package varlink
+
+import (
+	"github.com/varlink/go/varlink/internal/ctxio"
+	"io"
+	"os/exec"
+)
+
+// NewBridgeWithStderr returns a new connection with the given bridge.
+func NewBridgeWithStderr(bridge string, stderr io.Writer) (*Connection, error) {
+	c := Connection{}
+	cmd := exec.Command("sh", "-c", bridge)
+	cmd.Stderr = stderr
+	r, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+	w, err := cmd.StdinPipe()
+	if err != nil {
+		return nil, err
+	}
+	c.conn = ctxio.NewConn(PipeCon{cmd, r, w})
+	c.address = ""
+
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	return &c, nil
+}

varlink/newbridge_windows.go

@@ -0,0 +1,31 @@
+package varlink
+
+import (
+	"github.com/varlink/go/varlink/internal/ctxio"
+	"io"
+	"os/exec"
+)
+
+// NewBridgeWithStderr returns a new connection with the given bridge.
+func NewBridgeWithStderr(bridge string, stderr io.Writer) (*Connection, error) {
+	c := Connection{}
+	cmd := exec.Command("cmd", "/C", bridge)
+	cmd.Stderr = stderr
+	r, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, err
+	}
+	w, err := cmd.StdinPipe()
+	if err != nil {
+		return nil, err
+	}
+	c.conn = ctxio.NewConn(PipeCon{cmd, r, w})
+	c.address = ""
+
+	err = cmd.Start()
+	if err != nil {
+		return nil, err
+	}
+
+	return &c, nil
+}