3 files changed, 51 insertions, 0 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index f502e7a67..7a015b300 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -16,7 +16,9 @@ import (
 	_ "github.com/containers/libpod/cmd/podman/system"
 	_ "github.com/containers/libpod/cmd/podman/volumes"
 	"github.com/containers/libpod/pkg/rootless"
+	"github.com/containers/libpod/pkg/terminal"
 	"github.com/containers/storage/pkg/reexec"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -53,6 +55,10 @@ func main() {
 			}
 		}
 	}
+	if err := terminal.SetConsole(); err != nil {
+		logrus.Error(err)
+		os.Exit(1)
+	}
 
 	Execute()
 	os.Exit(0)
diff --git a/pkg/terminal/console_unix.go b/pkg/terminal/console_unix.go
new file mode 100644
index 000000000..6eee6aa2f
--- /dev/null
+++ b/pkg/terminal/console_unix.go
@@ -0,0 +1,8 @@
+// +build !windows
+
+package terminal
+
+// SetConsole for non-windows environments is a no-op
+func SetConsole() error {
+	return nil
+}
diff --git a/pkg/terminal/console_windows.go b/pkg/terminal/console_windows.go
new file mode 100644
index 000000000..c7691857c
--- /dev/null
+++ b/pkg/terminal/console_windows.go
@@ -0,0 +1,37 @@
+// +build windows
+
+package terminal
+
+import (
+	"github.com/sirupsen/logrus"
+	"golang.org/x/sys/windows"
+)
+
+// SetConsole switches the windows terminal mode to be able to handle colors, etc
+func SetConsole() error {
+	if err := setConsoleMode(windows.Stdout, windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING); err != nil {
+		return err
+	}
+	if err := setConsoleMode(windows.Stderr, windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING); err != nil {
+		return err
+	}
+	if err := setConsoleMode(windows.Stdin, windows.ENABLE_VIRTUAL_TERMINAL_PROCESSING); err != nil {
+		return err
+	}
+	return nil
+}
+
+func setConsoleMode(handle windows.Handle, flags uint32) error {
+	var mode uint32
+	err := windows.GetConsoleMode(handle, &mode)
+	if err != nil {
+		return err
+	}
+	if err := windows.SetConsoleMode(handle, mode|flags); err != nil {
+		// In similar code, it is not considered an error if we cannot set the
+		// console mode.  Following same line of thinking here.
+		logrus.WithError(err).Error("Failed to set console mode for cli")
+	}
+
+	return nil
+}