]> git.ipfire.org Git - thirdparty/systemd.git/commit
journalctl: fix when --since, --until and --lines are used altogether
authorMike Yuan <me@yhndnzj.com>
Thu, 9 Mar 2023 08:51:24 +0000 (16:51 +0800)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 9 Mar 2023 12:36:12 +0000 (21:36 +0900)
commit5d2ab010dff42ccd5281c2b7ff60c4551fbcfbdf
treea48db54ae4b83da9dea6ae71e60c13e6b3965257
parentb2d3e2a0dc39313a46feb9194114c5554bacb0d9
journalctl: fix when --since, --until and --lines are used altogether

This is a follow-up for #26669 (81fb5375b3b3bfc22d023d7908ad9eee4b3c1ffb).

After the mentioned commit, we stopped checking if the
entry is within the range of --until if --lines is used.

However, when --since, --until and --lines=N are used
altogether, and the number of lines between --since
and --until is smaller than N, we would seek to --since
later (f58269510727964cb5c10e7d2f9849c442ea1f80).
This breaks the assumption that if --lines is set,
the boundary is never exceeded because the counter of
outputs gets us covered.
src/journal/journalctl.c