From: Lars Karlitski <lars@karlitski.net>
Date: Thu, 11 May 2017 20:39:23 +0000 (+0200)
Subject: journalctl: honor --show-cursor in more sitatuations
X-Git-Tag: v234~77^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f42943c35c753148566e5887a2b9dbf982b42cf;p=thirdparty%2Fsystemd.git

journalctl: honor --show-cursor in more sitatuations

Try to honor --show-cursor in more situations by never terminating early
when we didn't read any logs.

In particular, sd_journal_previous_skip() now returns 0 when it didn't
actually skip anything (for example with --lines=0), which resulted in
--show-cursor not working anymore.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index f990ac93035..698a5a9dc85 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2365,20 +2365,13 @@ int main(int argc, char *argv[]) {
                 log_error_errno(r, "Failed to iterate through journal: %m");
                 goto finish;
         }
-        if (r == 0) {
-                if (arg_follow)
-                        need_seek = true;
-                else {
-                        if (!arg_quiet)
-                                printf("-- No entries --\n");
-                        goto finish;
-                }
-        }
+        if (r == 0)
+                need_seek = true;
 
         if (!arg_follow)
                 pager_open(arg_no_pager, arg_pager_end);
 
-        if (!arg_quiet) {
+        if (!arg_quiet && (arg_lines != 0 || arg_follow)) {
                 usec_t start, end;
                 char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX];
 
@@ -2474,6 +2467,9 @@ int main(int argc, char *argv[]) {
                 }
 
                 if (!arg_follow) {
+                        if (n_shown == 0 && !arg_quiet)
+                                printf("-- No entries --\n");
+
                         if (arg_show_cursor) {
                                 _cleanup_free_ char *cursor = NULL;