Re: [PATCH] tools: perf: prefer clarity in setup_pager

[Stephane Eranian]

On Mon, Jul 7, 2014 at 2:40 AM, Michael Lentine <mlentine@xxxxxxxxxx> 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@xxxxxxxxxx>
> 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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/