X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournalctl.c;h=58778a81f687dd2310343a1eeb4ac564a0454473;hb=89834a7c1c5f194d072d42d1c30077f5b2c207ec;hp=2e708e959be1d8e73e2e545b16c61984bb6af2eb;hpb=81527be142678057215665be66e4b3c8306a7ab3;p=elogind.git diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 2e708e959..58778a81f 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -6,16 +6,16 @@ Copyright 2011 Lennart Poettering systemd is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. systemd is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + Lesser General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with systemd; If not, see . ***/ @@ -44,19 +44,26 @@ 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 bool arg_quiet = false; +static bool arg_local = false; static int help(void) { - printf("%s [OPTIONS...] {COMMAND} ...\n\n" + printf("%s [OPTIONS...] [MATCH]\n\n" "Send control commands to or query the journal.\n\n" " -h --help Show this help\n" " --version Show package version\n" " --no-pager Do not pipe output into a pager\n" - " -a --all Show all properties, including long and unprintable\n" + " -a --all Show all fields, including long and unprintable\n" " -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" + " -q --quiet Don't show privilege warning\n" + " --new-id128 Generate a new 128 Bit id\n" + " -l --local Only local entries\n", program_invocation_short_name); return 0; @@ -67,7 +74,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[] = { @@ -79,6 +87,9 @@ 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 }, + { "quiet", no_argument, NULL, 'q' }, + { "local", no_argument, NULL, 'l' }, { NULL, 0, NULL, 0 } }; @@ -87,7 +98,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 0); assert(argv); - while ((c = getopt_long(argc, argv, "hfo:an:", options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hfo:an:ql", options, NULL)) >= 0) { switch (c) { @@ -134,6 +145,18 @@ static int parse_argv(int argc, char *argv[]) { arg_no_tail = true; break; + case ARG_NEW_ID128: + arg_new_id128 = true; + break; + + case 'q': + arg_quiet = true; + break; + + case 'l': + arg_local = true; + break; + case '?': return -EINVAL; @@ -143,12 +166,40 @@ static int parse_argv(int argc, char *argv[]) { } } - if (arg_follow && !arg_no_tail) + if (arg_follow && !arg_no_tail && arg_lines < 0) arg_lines = 10; 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; @@ -162,7 +213,17 @@ int main(int argc, char *argv[]) { if (r <= 0) goto finish; - r = sd_journal_open(&j, 0); + if (arg_new_id128) { + r = generate_new_id128(); + goto finish; + } + +#ifdef HAVE_ACL + if (!arg_quiet && geteuid() != 0 && in_group("adm") <= 0) + log_warning("Showing user generated messages only. Users in the group 'adm' can see all messages. Pass -q to turn this message off."); +#endif + + r = sd_journal_open(&j, arg_local ? SD_JOURNAL_LOCAL_ONLY : 0); if (r < 0) { log_error("Failed to open journal: %s", strerror(-r)); goto finish; @@ -230,7 +291,7 @@ int main(int argc, char *argv[]) { line ++; - r = output_journal(j, arg_output, line, arg_show_all); + r = output_journal(j, arg_output, line, 0, arg_show_all); if (r < 0) goto finish; @@ -240,7 +301,7 @@ int main(int argc, char *argv[]) { if (!arg_follow) break; - r = fd_wait_for_event(fd, POLLIN); + r = fd_wait_for_event(fd, POLLIN, (usec_t) -1); if (r < 0) { log_error("Couldn't wait for event: %s", strerror(-r)); goto finish;