X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=184a0f57846dcb520ed79cd6fec9adc93bcafa36;hp=bb3e17fee2af206041162b7f0297c9cde520a461;hb=7a5c4acd5fdf4e5536ae00cdfe71a1ebe39b86a7;hpb=f907bc6963fe2c78ad1bde4b93095d463cb9d2a4 diff --git a/src/shared/pager.c b/src/shared/pager.c index bb3e17fee..184a0f578 100644 --- a/src/shared/pager.c +++ b/src/shared/pager.c @@ -36,6 +36,7 @@ #include "process-util.h" #include "signal-util.h" #include "string-util.h" +#include "strv.h" #include "terminal-util.h" static pid_t pager_pid = 0; @@ -71,7 +72,7 @@ int pager_open(bool no_pager, bool jump_to_end) { pager = getenv("PAGER"); /* If the pager is explicitly turned off, honour it */ - if (pager && (pager[0] == 0 || streq(pager, "cat"))) + if (pager && STR_IN_SET(pager, "", "cat")) return 0; /* Determine and cache number of columns before we spawn the