From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 2 Jul 2021 13:30:43 +0000 (+0200)
Subject: coredumpctl: show --help text if "coredumpctl help" is called
X-Git-Tag: v249~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d8be376e1682a79f0aecceb2136884c5b4327e2;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 9a577d47c8b..def3650bb45 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();
@@ -1242,6 +1242,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 },
                 {}
         };