From fafb6eccc2c9e3f8d6ce0aad9cb428f8cc402b24 Mon Sep 17 00:00:00 2001 From: Zbigniew Jedrzejewski-Szmek Date: Fri, 20 Jul 2012 09:06:26 +0200 Subject: journalctl: fix ellipsization with PAGER=cat There are other reasons for not opening the pager then the --no-pager or --follow options (described below). If the pager is not used, messages must be ellipsized. On Fri, Jul 20, 2012 at 05:42:44AM +0000, Shawn Landen wrote: > "Pager to use when --no-pager is not given; overrides $PAGER. > Setting this to an empty string or the value cat is equivalent to passing --no-pager." --- src/journal/journalctl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/journal/journalctl.c') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index e9810c9a3d..e633dd34d7 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -398,11 +398,7 @@ int main(int argc, char *argv[]) { goto finish; } - have_pager = !arg_no_pager && !arg_follow; - if (have_pager) { - columns(); - pager_open(); - } + have_pager = !arg_no_pager && !arg_follow && pager_open(); if (arg_output == OUTPUT_JSON) { fputc('[', stdout); -- cgit v1.2.3-54-g00ecf