From: Djalal Harouni <tixxdz@opendz.org>
Date: Wed, 11 Dec 2013 23:22:48 +0000 (+0100)
Subject: journal: pipe journalctl help output into a pager
X-Git-Tag: v209~1007
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=faf5077f891aa249270b2a3d9f0104c3eec02da6

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 5d12c2b16..cc338e098 100644
--- 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;
 
+static void pager_open_if_enabled(void) {
+
+        if (arg_no_pager)
+                return;
+
+        pager_open(arg_pager_end);
+}
+
 static int help(void) {
 
+        pager_open_if_enabled();
+
         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;
         }
 
-        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;