journal: properly implement matching with multiple matches

[elogind.git] / src / journal / journalctl.c

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index a6b6e0fbd6a3a150b13ecf75d3beb1fc0ca30206..3475b9d43c2b3b784454c5e81b8e5365db676f46 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -31,7 +31,7 @@
 #include "log.h"
 
 int main(int argc, char *argv[]) {
-        int r;
+        int r, i;
         sd_journal *j = NULL;
 
         log_set_max_level(LOG_DEBUG);
@@ -46,6 +46,14 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        for (i = 1; i < argc; i++) {
+                r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
+                if (r < 0) {
+                        log_error("Failed to add match: %s", strerror(-r));
+                        goto finish;
+                }
+        }
+
         SD_JOURNAL_FOREACH(j) {
                 const void *data;
                 size_t length;