From 0c627ea8c3cc862ae75011fd19486724efdf240b Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 19 Jul 2015 00:07:42 +0000 Subject: If we aren't on a tty, clear the pager flag up front. Just to clean up code structure, no functional change. --- main.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'main.c') diff --git a/main.c b/main.c index 669bfaed..0d02a03d 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.240 2015/07/18 05:47:32 schwarze Exp $ */ +/* $Id: main.c,v 1.241 2015/07/19 00:07:42 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze @@ -419,6 +419,9 @@ main(int argc, char *argv[]) if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths)) return((int)MANDOCLEVEL_BADARG); + if (pager_pid == 1 && isatty(STDOUT_FILENO) == 0) + pager_pid = 0; + curp.mchars = mchars_alloc(); curp.mp = mparse_alloc(options, curp.wlevel, mmsg, curp.mchars, defos); @@ -430,7 +433,7 @@ main(int argc, char *argv[]) mparse_keep(curp.mp); if (argc < 1) { - if (pager_pid == 1 && isatty(STDOUT_FILENO)) + if (pager_pid == 1) pager_pid = spawn_pager(); parse(&curp, STDIN_FILENO, ""); } @@ -442,7 +445,7 @@ main(int argc, char *argv[]) rc = rctmp; if (fd != -1) { - if (pager_pid == 1 && isatty(STDOUT_FILENO)) + if (pager_pid == 1) pager_pid = spawn_pager(); if (resp == NULL) -- cgit v1.2.3-56-ge451