tools lib subcmd: Support overwriting the pager (03a1f49f) · Commits · 戴 / test

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:

tools/lib/subcmd/pager.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -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;

+1 −0

Original line number	Diff line number	Diff line
		@@ -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 */