X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fcoredumpctl.c;h=b6e558186d812111cdaca948aeb91449e84c0cd2;hb=18cf1a1be5ae6985f211ec6f02504506da36b223;hp=60bba7f0e83b0d0ecd256a56fdf8f64d43286251;hpb=4f76ae1b4bfca0975373b78349928a60e94b000c;p=elogind.git

diff --git a/src/journal/coredumpctl.c b/src/journal/coredumpctl.c
index 60bba7f0e..b6e558186 100644
--- a/src/journal/coredumpctl.c
+++ b/src/journal/coredumpctl.c
@@ -19,6 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include <locale.h>
 #include <stdio.h>
 #include <string.h>
 #include <getopt.h>
@@ -87,6 +88,8 @@ static int help(void) {
                "Commands:\n"
                "  -h --help         Show this help\n"
                "  --version         Print version string\n"
+               "  -F --field=FIELD  List all values a certain field takes\n"
+               "  gdb               Start gdb for the first matching coredump\n"
                "  list              List available coredumps\n"
                "  dump PID          Print coredump to stdout\n"
                "  dump PATH         Print coredump to stdout\n"
@@ -167,7 +170,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         arg_action = ACTION_NONE;
                         return 0;
@@ -259,7 +261,7 @@ static int retrieve(const void *data,
                 return 0;
 
         *var = strndup((const char*)data + ident, len - ident);
-        if (!var)
+        if (!*var)
                 return log_oom();
 
         return 0;
@@ -339,6 +341,11 @@ static int dump_list(sd_journal *j) {
 
         assert(j);
 
+        /* The coredumps are likely to compressed, and for just
+         * listing them we don#t need to decompress them, so let's
+         * pick a fairly low data threshold here */
+        sd_journal_set_data_threshold(j, 4096);
+
         SD_JOURNAL_FOREACH(j) {
                 if (field)
                         print_field(stdout, j);
@@ -378,6 +385,9 @@ static int dump_core(sd_journal* j) {
 
         assert(j);
 
+        /* We want full data, nothing truncated. */
+        sd_journal_set_data_threshold(j, 0);
+
         r = focus(j);
         if (r < 0)
                 return r;
@@ -425,6 +435,8 @@ static int run_gdb(sd_journal *j) {
 
         assert(j);
 
+        sd_journal_set_data_threshold(j, 0);
+
         r = focus(j);
         if (r < 0)
                 return r;
@@ -512,6 +524,7 @@ int main(int argc, char *argv[]) {
         Iterator it;
         int r = 0;
 
+        setlocale(LC_ALL, "");
         log_parse_environment();
         log_open();