journalctl: check first if match is a path name

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

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 58778a81f687dd2310343a1eeb4ac564a0454473..9d4403267eb8aa22b6b7c113783accad468bf6fc 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -29,11 +29,13 @@
 #include <sys/poll.h>
 #include <time.h>
 #include <getopt.h>
+#include <sys/stat.h>
 
 #include <systemd/sd-journal.h>
 
 #include "log.h"
 #include "util.h"
+#include "path-util.h"
 #include "build.h"
 #include "pager.h"
 #include "logs-show.h"
@@ -205,6 +207,7 @@ int main(int argc, char *argv[]) {
         sd_journal *j = NULL;
         unsigned line = 0;
         bool need_seek = false;
+        struct stat st;
 
         log_parse_environment();
         log_open();
@@ -230,7 +233,42 @@ int main(int argc, char *argv[]) {
         }
 
         for (i = optind; i < argc; i++) {
-                r = sd_journal_add_match(j, argv[i], strlen(argv[i]));
+                if (path_is_absolute(argv[i])) {
+                        char *p = NULL;
+                        const char *path;
+
+                        p = canonicalize_file_name(argv[i]);
+                        path = p ? p : argv[i];
+
+                        if (stat(path, &st) < 0)  {
+                                free(p);
+                                log_error("Couldn't stat file: %m");
+                                r = -errno;
+                                goto finish;
+                        }
+
+                        if (S_ISREG(st.st_mode) && (0111 & st.st_mode)) {
+                                char *t;
+
+                                t = strappend("_EXE=", path);
+                                if (!t) {
+                                        free(p);
+                                        log_error("Out of memory");
+                                        goto finish;
+                                }
+
+                                r = sd_journal_add_match(j, t, strlen(t));
+                                free(t);
+                        } else {
+                                free(p);
+                                log_error("File is not a regular file or is not executable: %s", argv[i]);
+                                goto finish;
+                        }
+
+                        free(p);
+                } else
+                        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;