doesn't need to include limits.h version w/o attached On Wed, 2012-05-30 at 09:43 -0700, Shawn Landden wrote: > --- > TODO | 2 +- > src/journal/journalctl.c | 26 +++++++++++++++++++++++++- > 2 files changed, 26 insertions(+), 2 deletions(-) > > diff --git a/TODO b/TODO > index 3b3c451..f55a586 100644 > --- a/TODO > +++ b/TODO > @@ -39,7 +39,7 @@ Features: > - graphical sessions will show a dialog, like they do already today > - use udev to tag input devices we want to subscribe to > > -* journalctl /dev/sda, journalctl /usr/bin/httpd, journalctl --device=b12:8 > (--device=n12, --device=+usb:1-1) > +* journalctl /dev/sda, journalctl --device=b12:8 (--device=n12, > --device=+usb:1-1) > > * make use of /sys/power/wake_lock in inhibitors > > diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c > index 58778a8..6b2aee7 100644 > --- a/src/journal/journalctl.c > +++ b/src/journal/journalctl.c > @@ -29,6 +29,8 @@ > #include <sys/poll.h> > #include <time.h> > #include <getopt.h> > +#include <sys/stat.h> > +#include <limits.h> > > #include <systemd/sd-journal.h> > > @@ -38,6 +40,8 @@ > #include "pager.h" > #include "logs-show.h" > > +#define SD_JOURNALCTL_EXE "_EXE=" > + > static OutputMode arg_output = OUTPUT_SHORT; > static bool arg_follow = false; > static bool arg_show_all = false; > @@ -205,6 +209,8 @@ int main(int argc, char *argv[]) { > sd_journal *j = NULL; > unsigned line = 0; > bool need_seek = false; > + struct stat st; > + char* journal_exe_buff; > > log_parse_environment(); > log_open(); > @@ -230,7 +236,25 @@ int main(int argc, char *argv[]) { > } > > for (i = optind; i < argc; i++) { > - r = sd_journal_add_match(j, argv[i], strlen(argv[i])); > + if (strchr(argv[i], '=')) { > + r = sd_journal_add_match(j, argv[i], > strlen(argv[i])); > + } else { > + if (stat(argv[i], &st) < 0) { > + log_error("Failed to add match: %s", > strerror(-r)); > + goto finish; /* maybe try > sd_journal_add_match() when stat() fails, > + * even thought we know there > is no '=' ? */ > + } else if (S_ISREG(st.st_mode) && > + S_IXUSR & st.st_mode) { > + journal_exe_buff = > malloc(strlen(SD_JOURNALCTL_EXE) + strlen(argv[i]) + 1); > + journal_exe_buff = strcpy(journal_exe_buff, > SD_JOURNALCTL_EXE); > + strncat(journal_exe_buff, argv[i], > strlen(argv[i])); > + r = sd_journal_add_match(j, > journal_exe_buff, strlen(journal_exe_buff)); > + free(journal_exe_buff); > + } else { > + log_error("File is not a regular file or is > not executable: %s", argv[i]); > + goto finish; > + } > + } > if (r < 0) { > log_error("Failed to add match: %s", strerror(-r)); > goto finish;
-- -Shawn Landden
>From 65f0cfc90ff9335233d800ffbadc59ee1ad55a78 Mon Sep 17 00:00:00 2001 From: Shawn Landden <shawnland...@gmail.com> Date: Tue, 29 May 2012 20:00:56 -0700 Subject: [PATCH] journalctl: support /usr/bin/nginx, etc --- TODO | 2 +- src/journal/journalctl.c | 25 ++++++++++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/TODO b/TODO index 3b3c451..f55a586 100644 --- a/TODO +++ b/TODO @@ -39,7 +39,7 @@ Features: - graphical sessions will show a dialog, like they do already today - use udev to tag input devices we want to subscribe to -* journalctl /dev/sda, journalctl /usr/bin/httpd, journalctl --device=b12:8 (--device=n12, --device=+usb:1-1) +* journalctl /dev/sda, journalctl --device=b12:8 (--device=n12, --device=+usb:1-1) * make use of /sys/power/wake_lock in inhibitors diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 58778a8..daf4281 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -29,6 +29,7 @@ #include <sys/poll.h> #include <time.h> #include <getopt.h> +#include <sys/stat.h> #include <systemd/sd-journal.h> @@ -38,6 +39,8 @@ #include "pager.h" #include "logs-show.h" +#define SD_JOURNALCTL_EXE "_EXE=" + static OutputMode arg_output = OUTPUT_SHORT; static bool arg_follow = false; static bool arg_show_all = false; @@ -205,6 +208,8 @@ int main(int argc, char *argv[]) { sd_journal *j = NULL; unsigned line = 0; bool need_seek = false; + struct stat st; + char* journal_exe_buff; log_parse_environment(); log_open(); @@ -230,7 +235,25 @@ int main(int argc, char *argv[]) { } for (i = optind; i < argc; i++) { - r = sd_journal_add_match(j, argv[i], strlen(argv[i])); + if (strchr(argv[i], '=')) { + r = sd_journal_add_match(j, argv[i], strlen(argv[i])); + } else { + if (stat(argv[i], &st) < 0) { + log_error("Failed to add match: %s", strerror(-r)); + goto finish; /* maybe try sd_journal_add_match() when stat() fails, + * even thought we know there is no '=' ? */ + } else if (S_ISREG(st.st_mode) && + S_IXUSR & st.st_mode) { + journal_exe_buff = malloc(strlen(SD_JOURNALCTL_EXE) + strlen(argv[i]) + 1); + journal_exe_buff = strcpy(journal_exe_buff, SD_JOURNALCTL_EXE); + strncat(journal_exe_buff, argv[i], strlen(argv[i])); + r = sd_journal_add_match(j, journal_exe_buff, strlen(journal_exe_buff)); + free(journal_exe_buff); + } else { + log_error("File is not a regular file or is not executable: %s", argv[i]); + goto finish; + } + } if (r < 0) { log_error("Failed to add match: %s", strerror(-r)); goto finish; -- 1.7.9.5
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel