From 2b696a98569339287894df4a40676745f6111d7e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 25 Dec 2003 14:28:55 -0500 Subject: Try to use the DEBUGFS_PAGER environment variable first, and then fall back to the PAGER environment variable. Finally, search for an appropriate pager executable. --- debugfs/util.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) (limited to 'debugfs/util.c') diff --git a/debugfs/util.c b/debugfs/util.c index 319d4fba..4da7f6e2 100644 --- a/debugfs/util.c +++ b/debugfs/util.c @@ -80,20 +80,15 @@ FILE *open_pager(void) char buf[80]; signal(SIGPIPE, SIG_IGN); - if (pager) { - if (strcmp(pager, "__none__") == 0) { - return stdout; - } - } else + if (!pager) + pager = getenv("DEBUGFS_PAGER"); + if (!pager) pager = find_pager(buf); - - if (pager) - outfile = popen(pager, "w"); - - if (!outfile) - outfile = stdout; - - return (outfile); + if (!pager || + (strcmp(pager, "__none__") == 0) || + ((outfile = popen(pager, "w")) == 0)) + return stdout; + return outfile; } void close_pager(FILE *stream) -- cgit v1.2.3