tools lib subcmd: Support overwriting the pager

Add an interface to the auto pager code that allows callers to overwrite
the pager.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20180918123214.26728-3-andi@firstfloor.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c
index 9997a8805a82d2ffa2f378390781984b7ac6311f..e3d47b59b14d8c9e31b3c5376d34f84b878f270f 100644 (file)
--- a/tools/lib/subcmd/pager.c
+++ b/tools/lib/subcmd/pager.c
@@ -23,6 +23,13 @@ void pager_init(const char *pager_env)
        subcmd_config.pager_env = pager_env;
 }
 
+static const char *forced_pager;
+
+void force_pager(const char *pager)
+{
+       forced_pager = pager;
+}
+
 static void pager_preexec(void)
 {
        /*
@@ -66,7 +73,9 @@ void setup_pager(void)
        const char *pager = getenv(subcmd_config.pager_env);
        struct winsize sz;
 
-       if (!isatty(1))
+       if (forced_pager)
+               pager = forced_pager;
+       if (!isatty(1) && !forced_pager)
                return;
        if (ioctl(1, TIOCGWINSZ, &sz) == 0)
                pager_columns = sz.ws_col;

diff --git a/tools/lib/subcmd/pager.h b/tools/lib/subcmd/pager.h
index f1a53cf2988045b73ad9d9376028fc62aed2169a..a818964693abd4d1b4008091c0f3ea2b5cefba8d 100644 (file)
--- a/tools/lib/subcmd/pager.h
+++ b/tools/lib/subcmd/pager.h
@@ -7,5 +7,6 @@ extern void pager_init(const char *pager_env);
 extern void setup_pager(void);
 extern int pager_in_use(void);
 extern int pager_get_columns(void);
+extern void force_pager(const char *);
 
 #endif /* __SUBCMD_PAGER_H */