X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fpager.c;h=184a0f57846dcb520ed79cd6fec9adc93bcafa36;hb=6357ed92bd48120109f246b34e0fa8977a2caedc;hp=8d60f8a7a10993614f26eecb8552c1b2ea48ff17;hpb=e0685d07cfad6cb53a3b961f0b32bfbced107792;p=elogind.git

diff --git a/src/shared/pager.c b/src/shared/pager.c
index 8d60f8a7a..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;
@@ -63,15 +64,15 @@ int pager_open(bool no_pager, bool jump_to_end) {
         if (pager_pid > 0)
                 return 1;
 
-        if (!on_tty())
-                        return 0;
+        if (terminal_is_dumb())
+                return 0;
 
         pager = getenv("SYSTEMD_PAGER");
         if (!pager)
                 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
@@ -158,13 +159,13 @@ void pager_close(void) {
                 return;
 
         /* Inform pager that we are done */
-#if defined(__GLIBC__)
+#ifdef __GLIBC__
         stdout = safe_fclose(stdout);
         stderr = safe_fclose(stderr);
 #else
-        (void) safe_fclose(stdout);
-        (void) safe_fclose(stderr);
-#endif // in musl-libc these are const
+        safe_fclose(stdout);
+        safe_fclose(stderr);
+#endif // __GLIBC__
 
         (void) kill(pager_pid, SIGCONT);
         (void) wait_for_terminate(pager_pid, NULL);