From fe59e38bef69568c385d10761132458606cdd896 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Mar 2013 21:49:12 +0100 Subject: [PATCH] journalctl: imply -n1000 when -e is used Make sure the pager does not have to buffer an unbounded number of log messages, by default. --- man/journalctl.xml | 12 ++++++++---- src/journal/journalctl.c | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/man/journalctl.xml b/man/journalctl.xml index 201f66a3b..3db5e5dab 100644 --- a/man/journalctl.xml +++ b/man/journalctl.xml @@ -168,10 +168,14 @@ Immediately jump to the end of the journal inside the - implied pager tool. Very useful in - combination with the - option. Note that - this is only supported for the + implied pager tool. This implies + to guarantee + that the pager won't buffer logs of + unbounded size. This may be overriden + with an explicit + with some other numeric value on the + command line. Note that this option is + only supported for the less1 pager. diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 5fb2db3ba..3682329e4 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -221,6 +221,10 @@ static int parse_argv(int argc, char *argv[]) { case 'e': arg_pager_end = true; + + if (arg_lines < 0) + arg_lines = 1000; + break; case 'f': -- 2.30.2