lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 7 Jul 2014 07:49:07 +0200 From: Stephane Eranian <eranian@...gle.com> To: Michael Lentine <mlentine@...gle.com> Cc: Michal Nazarewicz <mina86@...a86.com>, Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org> Subject: Re: [PATCH] tools: perf: prefer clarity in setup_pager On Mon, Jul 7, 2014 at 2:40 AM, Michael Lentine <mlentine@...gle.com> wrote: > Unless I'm missing something this removes defaulting the pager to cat if > nothing is found which is very useful for devices/oses without less or > pager. > > I think you are correct Michael. I don't quite understand the value of this patch. But by oversimplifying, it should not change the logic of the code. > On Sun, Jul 6, 2014 at 10:42 AM, Michal Nazarewicz <mina86@...a86.com> > wrote: >> >> “!(pager || access(…))” is indeed pretty smart way to write >> “!pager && access(…) == 0” but other than being clever it gives >> no advantages and merely confuses the reader who needs to wonder >> what is actually going on. >> >> As such, replace the checks with much cleaner ones. >> >> Also, while at it, merge the lest “!pager” test with the next >> test that yields true after the “!pager” if's body is executed. >> --- >> tools/perf/util/pager.c | 8 +++----- >> 1 file changed, 3 insertions(+), 5 deletions(-) >> >> diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c >> index 31ee02d..14da1b0 100644 >> --- a/tools/perf/util/pager.c >> +++ b/tools/perf/util/pager.c >> @@ -57,13 +57,11 @@ void setup_pager(void) >> } >> if (!pager) >> pager = getenv("PAGER"); >> - if (!(pager || access("/usr/bin/pager", X_OK))) >> + if (!pager && access("/usr/bin/pager", X_OK) == 0) >> pager = "/usr/bin/pager"; >> - if (!(pager || access("/usr/bin/less", X_OK))) >> + if (!pager && access("/usr/bin/less", X_OK) == 0) >> pager = "/usr/bin/less"; >> - if (!pager) >> - pager = "cat"; >> - if (!*pager || !strcmp(pager, "cat")) >> + if (!pager || !*pager || !strcmp(pager, "cat")) >> return; >> >> spawned_pager = 1; /* means we are emitting to terminal */ >> -- >> 2.0.0.526.g5318336 >> > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists