X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=0b3a79bee97e3140f2af54e9f4d77c449bc75c9d;hb=3ba09ee8eb9453daf9228f612c9bcd59905fcf05;hp=0afeef932e54b89f615cf91570b0d0c239240894;hpb=96088db02b2802049f1edbd44d5f8c2ea838f3f2;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 0afeef932..0b3a79bee 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -433,7 +433,7 @@ static int parse_argv(int argc, char *argv[]) { if (arg_follow && !arg_no_tail && arg_lines < 0) arg_lines = 10; - if (arg_since_set && arg_until_set && arg_since_set > arg_until_set) { + if (arg_since_set && arg_until_set && arg_since > arg_until) { log_error("--since= must be before --until=."); return -EINVAL; } @@ -1076,6 +1076,8 @@ int main(int argc, char *argv[]) { log_error("Failed to determine timestamp: %s", strerror(-r)); goto finish; } + if (usec > arg_until) + goto finish; } if (!arg_merge) {