From: Wesley Dawson <whd@mozilla.com>
Date: Mon, 1 Dec 2014 07:27:00 +0000 (-0800)
Subject: journalctl: respect --after-cursor semantics with --follow in all cases
X-Git-Tag: v218~64
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8ee8e53648bf45854d92b60e1e70c17a0cec3c3d

journalctl: respect --after-cursor semantics with --follow in all cases

In the case where no entries have been added to the journal after the specified
cursor, set need_seek before the main loop to prevent display of the entry at
said cursor.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 5c2a56d57..3cec9a0c8 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1934,9 +1934,13 @@ int main(int argc, char *argv[]) {
                 else
                         r = sd_journal_previous_skip(j, 1 + !!arg_after_cursor);
 
-                if (arg_after_cursor && r < 2 && !arg_follow)
+                if (arg_after_cursor && r < 2) {
                         /* We couldn't find the next entry after the cursor. */
-                        arg_lines = 0;
+                        if (arg_follow)
+                                need_seek = true;
+                        else
+                                arg_lines = 0;
+                }
 
         } else if (arg_since_set && !arg_reverse) {
                 r = sd_journal_seek_realtime_usec(j, arg_since);