shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-08 05:57:26 +03:00
Code

journalctl: Correctly handle combination of --reverse and --lines (fixes #1596)

Browse Source 
(cherry picked from commit 23b392166388003530fef02ac5758c91315a707b)
(cherry picked from commit d8fd38769c36ef9b2e5e122c345bca05ef2be88f)
This commit is contained in:
Timo Schlüßler 2020-01-13 09:26:58 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent 0aa144ab1d
commit a592a40564
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/journal/journalctl.c
View File

@ -2429,15 +2429,6 @@ int main(int argc, char *argv[]) {
}
r = sd_journal_previous(j);
} else if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
log_error_errno(r, "Failed to seek to tail: %m");
goto finish;
}
r = sd_journal_previous_skip(j, arg_lines);
} else if (arg_reverse) {
r = sd_journal_seek_tail(j);
if (r < 0) {
@ -2447,6 +2438,15 @@ int main(int argc, char *argv[]) {
r = sd_journal_previous(j);
} else if (arg_lines >= 0) {
r = sd_journal_seek_tail(j);
if (r < 0) {
log_error_errno(r, "Failed to seek to tail: %m");
goto finish;
}
r = sd_journal_previous_skip(j, arg_lines);
} else {
r = sd_journal_seek_head(j);
if (r < 0) {