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.

2 files changed, 15 insertions, 13 deletions

diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index 839c04e6..4ca40ed5 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-25  Theodore Ts'o  <tytso@mit.edu>
+
+	* util.c (open_pager): 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.
+
 2003-12-11  Theodore Ts'o  <tytso@thunk.org>
 
 	* debugfs.c (do_write, do_mkdir): If the directory is full,
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)