picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Wesley Dawson 2014-11-30 23:27:00 -08:00 committed by Lennart Poettering
parent b1491eba40
commit 8ee8e53648
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journalctl.c
View File

@ -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);