Attachment 75447 Details for Bug 58946 – journal until option fix (alternative)

[patch] journal until option fix (alternative)

sd-journal-until.patch (text/plain), 1010 bytes, created by Paul W. Frields on 2013-02-24 14:21:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul W. Frields

Created: 2013-02-24 14:21:18 UTC

Size: 1010 bytes

patch

obsolete

>diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
>index a74d43b..a20d0da 100644
>--- a/src/journal/journalctl.c
>+++ b/src/journal/journalctl.c
>@@ -416,7 +416,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;
>         }
>@@ -1054,6 +1054,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) {

Actions: View | Splinter Review

Attachments on bug 58946: 72384 | 75447

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.