X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=4d9864729b2a9b0516bbd411955e86ff6b3adfd1;hb=d3f2bdbfee94a4cd124b66e610f4b926b749e192;hp=17d6a7fc2355d53f244dadf4ee2180cbce30fb39;hpb=df50185b43916926a72246ab3a80875eda7ad2a3;p=elogind.git

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 17d6a7fc2..4d9864729 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -30,7 +30,8 @@
 #include <time.h>
 #include <getopt.h>
 
-#include "sd-journal.h"
+#include <systemd/sd-journal.h>
+
 #include "log.h"
 #include "util.h"
 #include "build.h"
@@ -43,6 +44,7 @@ static bool arg_show_all = false;
 static bool arg_no_pager = false;
 static int arg_lines = -1;
 static bool arg_no_tail = false;
+static bool arg_new_id128 = false;
 
 static int help(void) {
 
@@ -55,7 +57,9 @@ static int help(void) {
                "  -f --follow         Follow journal\n"
                "  -n --lines=INTEGER  Journal entries to show\n"
                "     --no-tail        Show all lines, even in follow mode\n"
-               "  -o --output=STRING  Change journal output mode (short, verbose, export, json)\n",
+               "  -o --output=STRING  Change journal output mode (short, short-monotonic,\n"
+               "                      verbose, export, json, cat)\n"
+               "     --new-id128      Generate a new 128 Bit id\n",
                program_invocation_short_name);
 
         return 0;
@@ -66,7 +70,8 @@ static int parse_argv(int argc, char *argv[]) {
         enum {
                 ARG_VERSION = 0x100,
                 ARG_NO_PAGER,
-                ARG_NO_TAIL
+                ARG_NO_TAIL,
+                ARG_NEW_ID128
         };
 
         static const struct option options[] = {
@@ -78,6 +83,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "all",       no_argument,       NULL, 'a'           },
                 { "lines",     required_argument, NULL, 'n'           },
                 { "no-tail",   no_argument,       NULL, ARG_NO_TAIL   },
+                { "new-id128", no_argument,       NULL, ARG_NEW_ID128 },
                 { NULL,        0,                 NULL, 0             }
         };
 
@@ -133,6 +139,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_no_tail = true;
                         break;
 
+                case ARG_NEW_ID128:
+                        arg_new_id128 = true;
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -148,6 +158,34 @@ static int parse_argv(int argc, char *argv[]) {
         return 1;
 }
 
+static int generate_new_id128(void) {
+        sd_id128_t id;
+        int r;
+        unsigned i;
+
+        r = sd_id128_randomize(&id);
+        if (r < 0) {
+                log_error("Failed to generate ID: %s", strerror(-r));
+                return r;
+        }
+
+        printf("As string:\n"
+               SD_ID128_FORMAT_STR "\n\n"
+               "As UUID:\n"
+               "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n\n"
+               "As macro:\n"
+              "#define MESSAGE_XYZ SD_ID128_MAKE(",
+               SD_ID128_FORMAT_VAL(id),
+               SD_ID128_FORMAT_VAL(id));
+
+        for (i = 0; i < 16; i++)
+                printf("%02x%s", id.bytes[i], i != 15 ? "," : "");
+
+        fputs(")\n", stdout);
+
+        return 0;
+}
+
 int main(int argc, char *argv[]) {
         int r, i, fd;
         sd_journal *j = NULL;
@@ -161,6 +199,11 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
+        if (arg_new_id128) {
+                r = generate_new_id128();
+                goto finish;
+        }
+
         r = sd_journal_open(&j, 0);
         if (r < 0) {
                 log_error("Failed to open journal: %s", strerror(-r));