timedated: replace systemd-timedated-ntp.target logic with simpler scheme

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

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index ebc2a6aa49efd743444123237caa71c415fde8a1..e9d918a733a78fdc381ff3b1f2a20f93d89d1750 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"
@@ -50,7 +52,7 @@ static bool arg_local = false;
 
 static int help(void) {
 
-        printf("%s [OPTIONS...] {COMMAND} ...\n\n"
+        printf("%s [OPTIONS...] [MATCH]\n\n"
                "Send control commands to or query the journal.\n\n"
                "  -h --help           Show this help\n"
                "     --version        Show package version\n"
@@ -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;
@@ -243,6 +281,26 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        if (!arg_quiet) {
+                usec_t start, end;
+                char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX];
+
+                r = sd_journal_get_cutoff_realtime_usec(j, &start, &end);
+                if (r < 0) {
+                        log_error("Failed to get cutoff: %s", strerror(-r));
+                        goto finish;
+                }
+
+                if (r > 0) {
+                        if (arg_follow)
+                                printf("Logs begin at %s.\n", format_timestamp(start_buf, sizeof(start_buf), start));
+                        else
+                                printf("Logs begin at %s, end at %s.\n",
+                                       format_timestamp(start_buf, sizeof(start_buf), start),
+                                       format_timestamp(end_buf, sizeof(end_buf), end));
+                }
+        }
+
         if (arg_lines >= 0) {
                 r = sd_journal_seek_tail(j);
                 if (r < 0) {