diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-08-09 10:32:31 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-08-20 11:33:04 +0200 |
commit | 37ec0fdd3443a77a5120cf55002fedcb5b1dd069 (patch) | |
tree | 75c684fd19b60094f5a89220c728f5e12e4c34b8 /src/socket-proxy | |
parent | util: improve comments why we ignore EACCES and EPERM (diff) | |
download | systemd-37ec0fdd3443a77a5120cf55002fedcb5b1dd069.tar.gz systemd-37ec0fdd3443a77a5120cf55002fedcb5b1dd069.tar.bz2 systemd-37ec0fdd3443a77a5120cf55002fedcb5b1dd069.zip |
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.
Diffstat (limited to 'src/socket-proxy')
-rw-r--r-- | src/socket-proxy/socket-proxyd.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index b302a7762..4c60d97c3 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -18,11 +18,12 @@ #include "alloc-util.h" #include "fd-util.h" #include "log.h" +#include "parse-util.h" #include "path-util.h" #include "set.h" #include "socket-util.h" #include "string-util.h" -#include "parse-util.h" +#include "terminal-util.h" #include "util.h" #define BUFFER_SIZE (256 * 1024) @@ -534,14 +535,26 @@ static int add_listen_socket(Context *context, int fd) { return 0; } -static void help(void) { +static int help(void) { + _cleanup_free_ char *link = NULL; + int r; + + r = terminal_urlify_man("systemd-socket-proxyd", "8", &link); + if (r < 0) + return log_oom(); + printf("%1$s [HOST:PORT]\n" "%1$s [SOCKET]\n\n" "Bidirectionally proxy local sockets to another (possibly remote) socket.\n\n" " -c --connections-max= Set the maximum number of connections to be accepted\n" " -h --help Show this help\n" - " --version Show package version\n", - program_invocation_short_name); + " --version Show package version\n" + "\nSee the %2$s for details.\n" + , program_invocation_short_name + , link + ); + + return 0; } static int parse_argv(int argc, char *argv[]) { @@ -568,8 +581,10 @@ static int parse_argv(int argc, char *argv[]) { switch (c) { case 'h': - help(); - return 0; + return help(); + + case ARG_VERSION: + return version(); case 'c': r = safe_atou(optarg, &arg_connections_max); @@ -585,9 +600,6 @@ static int parse_argv(int argc, char *argv[]) { break; - case ARG_VERSION: - return version(); - case '?': return -EINVAL; |