X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=9d4403267eb8aa22b6b7c113783accad468bf6fc;hb=d2e54fae5ca7a0f71b5ac8b356a589ff0a09ea0a;hp=f90b2ddabe01ee7b3cdb0b590bee68e4d690af76;hpb=2af777ba966fcaefb02e87524583917726a470a1;p=elogind.git
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index f90b2ddab..9d4403267 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -6,16 +6,16 @@
Copyright 2011 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU General Public License
+ You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see .
***/
@@ -29,11 +29,13 @@
#include
#include
#include
+#include
#include
#include "log.h"
#include "util.h"
+#include "path-util.h"
#include "build.h"
#include "pager.h"
#include "logs-show.h"
@@ -46,10 +48,11 @@ static int arg_lines = -1;
static bool arg_no_tail = false;
static bool arg_new_id128 = false;
static bool arg_quiet = false;
+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"
@@ -61,7 +64,8 @@ static int help(void) {
" -o --output=STRING Change journal output mode (short, short-monotonic,\n"
" verbose, export, json, cat)\n"
" -q --quiet Don't show privilege warning\n"
- " --new-id128 Generate a new 128 Bit id\n",
+ " --new-id128 Generate a new 128 Bit id\n"
+ " -l --local Only local entries\n",
program_invocation_short_name);
return 0;
@@ -87,6 +91,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "no-tail", no_argument, NULL, ARG_NO_TAIL },
{ "new-id128", no_argument, NULL, ARG_NEW_ID128 },
{ "quiet", no_argument, NULL, 'q' },
+ { "local", no_argument, NULL, 'l' },
{ NULL, 0, NULL, 0 }
};
@@ -95,7 +100,7 @@ static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hfo:an:q", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) {
switch (c) {
@@ -150,6 +155,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_quiet = true;
break;
+ case 'l':
+ arg_local = true;
+ break;
+
case '?':
return -EINVAL;
@@ -198,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();
@@ -216,14 +226,49 @@ int main(int argc, char *argv[]) {
log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off.");
#endif
- r = sd_journal_open(&j, 0);
+ r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0);
if (r < 0) {
log_error("Failed to open journal: %s", strerror(-r));
goto finish;
}
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;