aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Cheng <bccheng@android.com>2014-06-23 19:58:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-23 19:58:28 +0000
commit01260fc4a8bd41c931a4a72b3fc07b0a3deb123e (patch)
tree2b27f9348ce16af50e9adb02f35bfaafa36e24ed
parentcf03ef19adb1408435f18f070b1d2d511cd80b78 (diff)
parentc48ff1dca20998d5a48606668ed1281d933db8a9 (diff)
downloadlinux-tools-perf-01260fc4a8bd41c931a4a72b3fc07b0a3deb123e.tar.gz
am c48ff1dc: Merge "perf should use "more" command, instead of "less" command. The latter is not included in AOSP, making perf report failed."
* commit 'c48ff1dca20998d5a48606668ed1281d933db8a9': perf should use "more" command, instead of "less" command. The latter is not included in AOSP, making perf report failed.
-rw-r--r--perf-3.12.0/tools/perf/util/pager.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/perf-3.12.0/tools/perf/util/pager.c b/perf-3.12.0/tools/perf/util/pager.c
index 3322b84..bbc83f8 100644
--- a/perf-3.12.0/tools/perf/util/pager.c
+++ b/perf-3.12.0/tools/perf/util/pager.c
@@ -20,8 +20,6 @@ static void pager_preexec(void)
FD_ZERO(&in);
FD_SET(0, &in);
select(1, &in, NULL, &in, NULL);
-
- setenv("LESS", "FRSX", 0);
}
static const char *pager_argv[] = { "sh", "-c", NULL, NULL };
@@ -62,7 +60,7 @@ void setup_pager(void)
pager = "/usr/bin/pager";
}
if (!pager)
- pager = "less";
+ pager = "more";
else if (!*pager || !strcmp(pager, "cat"))
return;