chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: fix --until
[elogind.git]
/
src
/
journal
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index 0afeef932e54b89f615cf91570b0d0c239240894..0b3a79bee97e3140f2af54e9f4d77c449bc75c9d 100644
(file)
--- 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_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;
}
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;
}
log_error("Failed to determine timestamp: %s", strerror(-r));
goto finish;
}
+ if (usec > arg_until)
+ goto finish;
}
if (!arg_merge) {
}
if (!arg_merge) {