lkml.org 
[lkml]   [2018]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v5 2/9] tools, pager: Support overwriting the pager
Em Tue, Sep 18, 2018 at 05:32:07AM -0700, Andi Kleen escreveu:
> From: Andi Kleen <ak@linux.intel.com>
>
> Add an interface to the auto pager code that allows callers
> to overwrite the pager.

Applied,

- Arnaldo

> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> ---
> tools/lib/subcmd/pager.c | 11 ++++++++++-
> tools/lib/subcmd/pager.h | 1 +
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/tools/lib/subcmd/pager.c b/tools/lib/subcmd/pager.c
> index 9997a8805a82..e3d47b59b14d 100644
> --- 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 f1a53cf29880..a818964693ab 100644
> --- 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 */
> --
> 2.17.1

\
 
 \ /
  Last update: 2018-09-19 20:19    [W:0.441 / U:0.264 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site