Fixing issue on Windows for cygwin terminals

xo · Mar 11, 2017 · 294a8e4 · 294a8e4
1 parent 11cea47
commit 294a8e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/handler.go b/handler.go
@@ -22,7 +22,9 @@ const (
 
 // Handler is a cli input handler.
 type Handler struct {
-	args        *Args
+	args *Args
+
+	cygwin      bool
 	interactive bool
 
 	u  *dburl.URL
@@ -326,6 +328,9 @@ func (h *Handler) Run() error {
 	// configure input
 	var stdin *os.File
 	stdout, stderr := readline.Stdout, readline.Stderr
+	if h.cygwin {
+		stdout, stderr = os.Stdout, os.Stderr
+	}
 
 	// set file as stdin
 	if h.args.File != "" {
@@ -352,7 +357,12 @@ func (h *Handler) Run() error {
 	// set stdin if not set
 	var r io.ReadCloser = stdin
 	if stdin == nil {
-		c := readline.NewCancelableStdin(readline.Stdin)
+		var c *readline.CancelableStdin
+		if h.cygwin {
+			c = readline.NewCancelableStdin(os.Stdin)
+		} else {
+			c = readline.NewCancelableStdin(readline.Stdin)
+		}
 		defer c.Close()
 
 		r = c

diff --git a/main.go b/main.go
@@ -39,11 +39,12 @@ func main() {
 	}
 	arg.MustParse(args)
 
-	interactive := (isatty.IsTerminal(os.Stdout.Fd()) && isatty.IsTerminal(os.Stdin.Fd())) ||
-		(isatty.IsCygwinTerminal(os.Stdout.Fd()) && isatty.IsCygwinTerminal(os.Stdin.Fd()))
+	cygwin := isatty.IsCygwinTerminal(os.Stdout.Fd()) && isatty.IsCygwinTerminal(os.Stdin.Fd())
+	interactive := isatty.IsTerminal(os.Stdout.Fd()) && isatty.IsTerminal(os.Stdin.Fd())
 	h := &Handler{
 		args:        args,
-		interactive: interactive,
+		cygwin:      cygwin,
+		interactive: interactive || cygwin,
 	}
 
 	// run