From bc196d19b7d2f0a5bc3218a577694724a653f010 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Jul 12 2021 11:30:54 +0000 Subject: coredumpctl: show --help text if "coredumpctl help" is called Most of our programs that take "verbs" make the "help" verb either equivalent to passing the --help switch (or at least print a message redirecting the user to that switch). Do so in coredumpctl too, in order to minimize surprises. (cherry picked from commit 6d8be376e1682a79f0aecceb2136884c5b4327e2) --- diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index cfe694c..fbd4df0 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -150,7 +150,7 @@ static int acquire_journal(sd_journal **ret, char **matches) { return 0; } -static int help(void) { +static int verb_help(int argc, char **argv, void *userdata) { _cleanup_free_ char *link = NULL; int r; @@ -232,7 +232,7 @@ static int parse_argv(int argc, char *argv[]) { while ((c = getopt_long(argc, argv, "hA:o:F:1D:rS:U:qn:", options, NULL)) >= 0) switch(c) { case 'h': - return help(); + return verb_help(0, NULL, NULL); case ARG_VERSION: return version(); @@ -1207,6 +1207,7 @@ static int coredumpctl_main(int argc, char *argv[]) { { "dump", VERB_ANY, VERB_ANY, 0, dump_core }, { "debug", VERB_ANY, VERB_ANY, 0, run_debug }, { "gdb", VERB_ANY, VERB_ANY, 0, run_debug }, + { "help", VERB_ANY, 1, 0, verb_help }, {} };