From 37ec0fdd3443a77a5120cf55002fedcb5b1dd069 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 9 Aug 2018 10:32:31 +0200 Subject: tree-wide: add clickable man page link to all --help texts This is a bit like the info link in most of GNU's --help texts, but we don't do info but man pages, and we make them properly clickable on terminal supporting that, because awesome. I think it's generally advisable to link up our (brief) --help texts and our (more comprehensive) man pages a bit, so this should be an easy and straight-forward way to do it. --- src/journal/journalctl.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'src/journal/journalctl.c') diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 799510504b..be37b879fa 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -297,10 +297,16 @@ static int parse_boot_descriptor(const char *x, sd_id128_t *boot_id, int *offset return 0; } -static void help(void) { +static int help(void) { + _cleanup_free_ char *link = NULL; + int r; (void) pager_open(arg_no_pager, arg_pager_end); + r = terminal_urlify_man("journalctl", "1", &link); + if (r < 0) + return log_oom(); + printf("%s [OPTIONS...] [MATCHES...]\n\n" "Query the journal.\n\n" "Options:\n" @@ -364,7 +370,12 @@ static void help(void) { " --update-catalog Update the message catalog database\n" " --new-id128 Generate a new 128-bit ID\n" " --setup-keys Generate a new FSS key pair\n" - , program_invocation_short_name); + "\nSee the %s for details.\n" + , program_invocation_short_name + , link + ); + + return 0; } static int parse_argv(int argc, char *argv[]) { @@ -478,8 +489,7 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); case ARG_VERSION: return version(); -- cgit v1.2.3