coredumpctl: add --field/-F option

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

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 03f063fe5fcd714c4aa32df756c42d48bf604383..60bba7f0e83b0d0ecd256a56fdf8f64d43286251 100644 (file)
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -43,8 +43,10 @@ static enum {
 
 static Set *matches = NULL;
 static FILE* output = NULL;
+static char* field = NULL;
 
 static int arg_no_pager = false;
+static int arg_no_legend = false;
 
 static Set *new_matches(void) {
         Set *set;
@@ -138,6 +140,7 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
+                ARG_NO_LEGEND,
         };
 
         int r, c;
@@ -146,14 +149,16 @@ static int parse_argv(int argc, char *argv[]) {
                 { "help",         no_argument,       NULL, 'h'           },
                 { "version" ,     no_argument,       NULL, ARG_VERSION   },
                 { "no-pager",     no_argument,       NULL, ARG_NO_PAGER  },
+                { "no-legend",    no_argument,       NULL, ARG_NO_LEGEND },
                 { "output",       required_argument, NULL, 'o'           },
+                { "field",        required_argument, NULL, 'F'           },
                 { NULL,           0,                 NULL, 0             }
         };
 
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "ho:", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "ho:F:", options, NULL)) >= 0)
                 switch(c) {
                 case 'h':
                         help();
@@ -171,6 +176,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_pager = true;
                         break;
 
+                case ARG_NO_LEGEND:
+                        arg_no_legend = true;
+                        break;
+
                 case 'o':
                         if (output) {
                                 log_error("cannot set output more than once");
@@ -185,6 +194,15 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
 
+                case 'F':
+                        if (field) {
+                                log_error("cannot use --field/-F more than once");
+                                return -EINVAL;
+                        }
+
+                        field = optarg;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -207,6 +225,11 @@ static int parse_argv(int argc, char *argv[]) {
                 }
         }
 
+        if (field && arg_action != ACTION_LIST) {
+                log_error("Option --field/-F only makes sense with list");
+                return -EINVAL;
+        }
+
         while (optind < argc) {
                 r = add_match(matches, argv[optind]);
                 if (r != 0)
@@ -222,27 +245,40 @@ static int retrieve(const void *data,
                     const char *name,
                     const char **var) {
 
-        size_t field;
+        size_t ident;
 
-        field = strlen(name) + 1; /* name + "=" */
+        ident = strlen(name) + 1; /* name + "=" */
 
-        if (len < field)
+        if (len < ident)
                 return 0;
 
-        if (memcmp(data, name, field - 1) != 0)
+        if (memcmp(data, name, ident - 1) != 0)
                 return 0;
 
-        if (((const char*) data)[field - 1] != '=')
+        if (((const char*) data)[ident - 1] != '=')
                 return 0;
 
-        *var = strndup((const char*)data + field, len - field);
+        *var = strndup((const char*)data + ident, len - ident);
         if (!var)
                 return log_oom();
 
         return 0;
 }
 
-static int print_entry(FILE* file, sd_journal *j, int had_header) {
+static void print_field(FILE* file, sd_journal *j) {
+        const char _cleanup_free_ *value = NULL;
+        const void *d;
+        size_t l;
+
+        assert(field);
+
+        SD_JOURNAL_FOREACH_DATA(j, d, l)
+                retrieve(d, l, field, &value);
+        if (value)
+                fprintf(file, "%s\n", value);
+}
+
+static int print_entry(FILE* file, sd_journal *j, int had_legend) {
         const char _cleanup_free_
                 *pid = NULL, *uid = NULL, *gid = NULL,
                 *sgnl = NULL, *exe = NULL;
@@ -278,7 +314,7 @@ static int print_entry(FILE* file, sd_journal *j, int had_header) {
 
         format_timestamp(buf, sizeof(buf), t);
 
-        if (!had_header)
+        if (!had_legend && !arg_no_legend)
                 fprintf(file, "%-*s %*s %*s %*s %*s %s\n",
                         FORMAT_TIMESTAMP_MAX-1, "TIME",
                         6, "PID",
@@ -303,10 +339,14 @@ static int dump_list(sd_journal *j) {
 
         assert(j);
 
-        SD_JOURNAL_FOREACH(j)
-                print_entry(stdout, j, found++);
+        SD_JOURNAL_FOREACH(j) {
+                if (field)
+                        print_field(stdout, j);
+                else
+                        print_entry(stdout, j, found++);
+        }
 
-        if (!found) {
+        if (!field && !found) {
                 log_notice("No coredumps found");
                 return -ESRCH;
         }