diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-07-19 00:07:42 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-07-19 00:07:42 +0000 |
| commit | 0c627ea8c3cc862ae75011fd19486724efdf240b (patch) | |
| tree | 7cb915925f70b98bc27e3afc8badc99b92a4bcf7 /main.c | |
| parent | 48fca13523c000fd7a2d1c1b70adcf495a95ecc4 (diff) | |
| download | mandoc-0c627ea8c3cc862ae75011fd19486724efdf240b.tar.gz mandoc-0c627ea8c3cc862ae75011fd19486724efdf240b.tar.zst mandoc-0c627ea8c3cc862ae75011fd19486724efdf240b.zip | |
If we aren't on a tty, clear the pager flag up front.
Just to clean up code structure, no functional change.
Diffstat (limited to 'main.c')
| -rw-r--r-- | main.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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 <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -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, "<stdin>"); } @@ -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) |