journal: pipe journalctl help output into a pager

journalctl help output might run off the screen, so be consistent
as other systemd tools do and pipe it into a pager.

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5d12c2b162ad83cb3dae2e7ead3707324ff6f338..cc338e0987cf8b21fd03d930a379b8a97bb13ccd 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -114,8 +114,18 @@ typedef struct boot_id_t {
         uint64_t last;
 } boot_id_t;
 
         uint64_t last;
 } boot_id_t;
 

+static void pager_open_if_enabled(void) {
+
+        if (arg_no_pager)
+                return;
+
+        pager_open(arg_pager_end);
+}
+

 static int help(void) {
 
 static int help(void) {
 

+        pager_open_if_enabled();
+

         printf("%s [OPTIONS...] [MATCHES...]\n\n"
                "Query the journal.\n\n"
                "Flags:\n"
         printf("%s [OPTIONS...] [MATCHES...]\n\n"
                "Query the journal.\n\n"
                "Flags:\n"


@@ -1647,8 +1657,8 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
                 return EXIT_FAILURE;
         }
 

-        if (!arg_no_pager && !arg_follow)
-                pager_open(arg_pager_end);
+        if (!arg_follow)
+                pager_open_if_enabled();

 
         if (!arg_quiet) {
                 usec_t start, end;
 
         if (!arg_quiet) {
                 usec_t start, end;