X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=0d37107874f262f41b128e48a04e689a4fb8d431;hb=dca6219e04505e9fa10b32e71059ce2abfae1dad;hp=65b3bd5a86f44abd31fd152b35dbb75702a71a33;hpb=7653b3c29adbad9d299fe9ff09ed30fbcc606acc;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 65b3bd5a8..0d3710787 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -40,6 +40,7 @@ #include "pager.h" #include "logs-show.h" #include "strv.h" +#include "journal-internal.h" static OutputMode arg_output = OUTPUT_SHORT; static bool arg_follow = false; @@ -48,6 +49,7 @@ static bool arg_no_pager = false; static int arg_lines = -1; static bool arg_no_tail = false; static bool arg_new_id128 = false; +static bool arg_print_header = false; static bool arg_quiet = false; static bool arg_local = false; static bool arg_this_boot = false; @@ -70,6 +72,7 @@ static int help(void) { " -l --local Only local entries\n" " -b --this-boot Show data only from current boot\n" " -D --directory=PATH Show journal files from directory\n" + " --header Show journal header information\n" " --new-id128 Generate a new 128 Bit id\n", program_invocation_short_name); @@ -82,7 +85,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_VERSION = 0x100, ARG_NO_PAGER, ARG_NO_TAIL, - ARG_NEW_ID128 + ARG_NEW_ID128, + ARG_HEADER }; static const struct option options[] = { @@ -99,6 +103,7 @@ static int parse_argv(int argc, char *argv[]) { { "local", no_argument, NULL, 'l' }, { "this-boot", no_argument, NULL, 'b' }, { "directory", required_argument, NULL, 'D' }, + { "header", no_argument, NULL, ARG_HEADER }, { NULL, 0, NULL, 0 } }; @@ -174,6 +179,10 @@ static int parse_argv(int argc, char *argv[]) { arg_directory = optarg; break; + case ARG_HEADER: + arg_print_header = true; + break; + case '?': return -EINVAL; @@ -331,6 +340,12 @@ int main(int argc, char *argv[]) { goto finish; } + if (arg_print_header) { + journal_print_header(j); + r = 0; + goto finish; + } + r = add_this_boot(j); if (r < 0) goto finish;