[systemd-commits] src/journal

[Zbigniew Jędrzejewski-Szmek]

 src/journal/journalctl.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 3ba09ee8eb9453daf9228f612c9bcd59905fcf05
Author: Paul W. Frields <stickster at gmail.com>
Date:   Sun Feb 24 15:27:51 2013 +0100

    journal: fix --until
    
    https://bugs.freedesktop.org/show_bug.cgi?id=58946

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 0afeef9..0b3a79b 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) {