iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf tools: Add cat as fallback pager

Browse Source 
This patch adds a fallback to cat for the pager. This is useful
on environments, such as Android, where less does not exist.
It is better to default to cat than to abort.

Signed-off-by: Michael Lentine <mlentine@google.com>
Reviewed-by: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1400579330-5043-2-git-send-email-eranian@google.com
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
This commit is contained in:
Michael Lentine
2014-05-20 11:48:49 +02:00
committed by Jiri Olsa
parent f21d181529
commit 21cfc5e103
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/perf/util/pager.c
View File

@@ -57,13 +57,13 @@ void setup_pager(void)
} }
if (!pager) if (!pager)
pager = getenv("PAGER"); pager = getenv("PAGER");
if (!pager) { if (!(pager || access("/usr/bin/pager", X_OK)))
if (!access("/usr/bin/pager", X_OK)) pager = "/usr/bin/pager";
pager = "/usr/bin/pager"; if (!(pager || access("/usr/bin/less", X_OK)))
} pager = "/usr/bin/less";
if (!pager) if (!pager)
pager = "less"; pager = "cat";
else if (!*pager || !strcmp(pager, "cat")) if (!*pager || !strcmp(pager, "cat"))
return; return;
spawned_pager = 1; /* means we are emitting to terminal */ spawned_pager = 1; /* means we are emitting to terminal */