From 49646f10f054863b17fcc203025fa65608b1ce94 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 7 Jan 2014 23:57:46 +0100
Subject: terminal: don't initialize termcap etc. if stdout is not a terminal

Otherwise, it seems one of the term* libraries will write escape
sequences to stdout, for whatever reason.
---
 osdep/terminal-unix.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'osdep')

diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c
index 03f2360916..193cd8557f 100644
--- a/osdep/terminal-unix.c
+++ b/osdep/terminal-unix.c
@@ -47,6 +47,8 @@
 #include "input/keycodes.h"
 #include "terminal.h"
 
+static int use_terminal;
+
 #if HAVE_TERMIOS
 static volatile struct termios tio_orig;
 static volatile int tio_orig_set;
@@ -454,7 +456,7 @@ static volatile int getch2_enabled = 0;
 
 static void do_activate_getch2(void)
 {
-    if (getch2_active)
+    if (getch2_active || !use_terminal)
         return;
 
 #if HAVE_TERMINFO || HAVE_TERMCAP
@@ -612,6 +614,8 @@ void terminal_setup_stdin_cmd_input(struct input_ctx *ictx)
 
 int terminal_init(void)
 {
-    load_termcap(NULL);
+    use_terminal = isatty(1);
+    if (use_terminal)
+        load_termcap(NULL);
     return 0;
 }
-- 
cgit v1.2.3