diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 11:37:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 11:37:40 +0200 |
| commit | e450f90e8c7d0bf70519223c1b848446ae63f313 (patch) | |
| tree | 078bfe88e5c3fbe397c9ca0d4d8ab2e0ff63979d /tools/perf/util/pager.c | |
| parent | 6480c56130ba073df84d57d61062ec4118b10bbe (diff) | |
| parent | eca8183699964579ca8a0b8d116bd1f4da0136f7 (diff) | |
| download | talos-op-linux-e450f90e8c7d0bf70519223c1b848446ae63f313.tar.gz talos-op-linux-e450f90e8c7d0bf70519223c1b848446ae63f313.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Android related fixes for pager and map dso resolving (Michael Lentine)
* Add -F option for specifying output fields (Namhyung Kim)
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/pager.c')
| -rw-r--r-- | tools/perf/util/pager.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c index 3322b8446e89..31ee02d4e988 100644 --- a/tools/perf/util/pager.c +++ b/tools/perf/util/pager.c @@ -57,13 +57,13 @@ void setup_pager(void) } if (!pager) pager = getenv("PAGER"); - if (!pager) { - if (!access("/usr/bin/pager", X_OK)) - pager = "/usr/bin/pager"; - } + if (!(pager || access("/usr/bin/pager", X_OK))) + pager = "/usr/bin/pager"; + if (!(pager || access("/usr/bin/less", X_OK))) + pager = "/usr/bin/less"; if (!pager) - pager = "less"; - else if (!*pager || !strcmp(pager, "cat")) + pager = "cat"; + if (!*pager || !strcmp(pager, "cat")) return; spawned_pager = 1; /* means we are emitting to terminal */ |
