systemd-hwdb: convert to VERB_COMMAND and add --introspect-cli

The custom help() is replaced by a COMMAND() description, and
--introspect-cli is added.

src/hwdb/hwdb.c

@@ -1,21 +1,25 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "alloc-util.h"
+#include "sd-json.h"
+
 #include "build.h"
 #include "dlopen-note.h"
-#include "format-table.h"
 #include "hwdb-util.h"
 #include "label-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "options.h"
-#include "pretty-print.h"
 #include "verbs.h"
 
 static const char *arg_hwdb_bin_dir = NULL;
 static const char *arg_root = NULL;
 static bool arg_strict = false;
 
+COMMAND(
+        "systemd-hwdb\0",
+        "Update or query the hardware database.",
+        .man_pages = "systemd-hwdb.8\0",
+);
+
 VERB(verb_query, "query", "MODALIAS", 2, 2, 0,
      "Query database and print result");
 static int verb_query(int argc, char *argv[], uintptr_t _data, void *userdata) {
@@ -31,51 +35,7 @@ static int verb_update(int argc, char *argv[], uintptr_t _data, void *userdata)
         return hwdb_update(arg_root, arg_hwdb_bin_dir, arg_strict, false);
 }
 
-static int help(void) {
-        _cleanup_free_ char *link = NULL;
-        _cleanup_(table_unrefp) Table *options = NULL, *verbs = NULL;
-        int r;
-
-        r = terminal_urlify_man("systemd-hwdb", "8", &link);
-        if (r < 0)
-                return log_oom();
-
-        r = verbs_get_help_table(&verbs);
-        if (r < 0)
-                return r;
-
-        r = option_parser_get_help_table(&options);
-        if (r < 0)
-                return r;
-
-        (void) table_sync_column_widths(0, verbs, options);
-
-        printf("%s [OPTIONS...] COMMAND ...\n\n"
-               "%sUpdate or query the hardware database.%s\n"
-               "\n%sCommands:%s\n",
-               program_invocation_short_name,
-               ansi_highlight(),
-               ansi_normal(),
-               ansi_underline(),
-               ansi_normal());
-
-        r = table_print_or_warn(verbs);
-        if (r < 0)
-                return r;
-
-        printf("\n%sOptions:%s\n",
-               ansi_underline(),
-               ansi_normal());
-
-        r = table_print_or_warn(options);
-        if (r < 0)
-                return r;
-
-        printf("\nSee the %s for details.\n", link);
-        return 0;
-}
-
-VERB_COMMON_HELP_HIDDEN(help);
+VERB_COMMON_HELP_AUTO_HIDDEN("systemd-hwdb");
 
 static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
@@ -88,7 +48,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 switch (c) {
 
                 OPTION_COMMON_HELP:
-                        return help();
+                        return command_print_help("systemd-hwdb");
 
                 OPTION_COMMON_VERSION:
                         return version();
@@ -106,6 +66,9 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                             "Generate in " UDEVLIBEXECDIR " instead of /etc/udev"):
                         arg_hwdb_bin_dir = UDEVLIBEXECDIR;
                         break;
+
+                OPTION_COMMON_INTROSPECT_CLI:
+                        return introspect_cli(SD_JSON_FORMAT_OFF);
                 }
 
         *ret_args = option_parser_get_args(&opts);

test/units/TEST-74-AUX-UTILS.introspect-cli.sh

@@ -17,6 +17,7 @@ INTROSPECTABLE=(
     systemd-backlight
     systemd-dissect
     systemd-firstboot
+    systemd-hwdb
     systemd-id128
     systemd-notify
     systemd-veritysetup
@@ -36,6 +37,12 @@ for i in "${INTROSPECTABLE[@]}"; do
     $i --intro | grep -e --help
 done
 
+# systemd-hwdb defines verbs, check that they are described
+if command -v systemd-hwdb >/dev/null; then
+    systemd-hwdb --introspect-cli | jq -e \
+            '.commands[0].verbs | map(.names[0]) | contains(["query", "update"])'
+fi
+
 # systemd-id128 defines verbs, check that they are described
 systemd-id128 --introspect-cli | jq -e \
     '.commands[0].verbs | map(.names[0]) | contains(["new", "machine-id", "show", "help"])'