From 951666e9f337974a5ffa5097b5613881a23ddd47 Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Thu, 24 Jan 2013 19:27:12 +0100
Subject: more: allow to compile as non-interactive test_more program

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 text-utils/Makemodule.am | 6 ++++++
 text-utils/more.c        | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/text-utils/Makemodule.am b/text-utils/Makemodule.am
index 050343eb7..6ddec56b3 100644
--- a/text-utils/Makemodule.am
+++ b/text-utils/Makemodule.am
@@ -87,5 +87,11 @@ else
 more_LDADD += -ltermcap
 endif
 endif
+
+check_PROGRAMS += test_more
+test_more_SOURCES = $(more_SOURCES)
+test_more_CFLAGS = -DTEST_PROGRAM
+test_more_LDADD = $(more_LDADD)
+
 endif # BUILD_MORE
 
diff --git a/text-utils/more.c b/text-utils/more.c
index 41caeb194..f0b0f67db 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -68,6 +68,10 @@
 
 #include <regex.h>
 
+#ifdef TEST_PROGRAM
+# define NON_INTERACTIVE_MORE 1
+#endif
+
 #ifndef XTABS
 # define XTABS	TAB3
 #endif
@@ -1759,7 +1763,10 @@ void initterm(void)
 #ifdef do_SIGTTOU
  retry:
 #endif
+
+#ifndef NON_INTERACTIVE_MORE
 	no_tty = tcgetattr(fileno(stdout), &otty);
+#endif
 	if (!no_tty) {
 		docrterase = (otty.c_cc[VERASE] != 255);
 		docrtkill = (otty.c_cc[VKILL] != 255);
-- 
cgit v1.2.3-55-g7522