From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Fri, 17 Apr 2026 06:41:30 +0000 (+0200)
Subject: ssh-issue: convert to the new option parser
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d8f4a469b7e2228fb3c9865da4b0ff6e2246cd9;p=thirdparty%2Fsystemd.git

ssh-issue: convert to the new option parser

--make-vsock and --rm-vsock are now described in --help, not only
shown in synopsis.

Co-developed-by: Claude Opus 4.7 <noreply@anthropic.com>
---

diff --git a/src/ssh-generator/ssh-issue.c b/src/ssh-generator/ssh-issue.c
index d2f02bd3d8a..d4e2443d1d9 100644
--- a/src/ssh-generator/ssh-issue.c
+++ b/src/ssh-generator/ssh-issue.c
@@ -1,6 +1,5 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <getopt.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
@@ -8,10 +7,12 @@
 #include "ansi-color.h"
 #include "build.h"
 #include "fd-util.h"
+#include "format-table.h"
 #include "fs-util.h"
 #include "log.h"
 #include "main-func.h"
 #include "mkdir.h"
+#include "options.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
 #include "ssh-util.h"
@@ -31,84 +32,72 @@ STATIC_DESTRUCTOR_REGISTER(arg_issue_path, freep);
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;
+        _cleanup_(table_unrefp) Table *options = NULL;
         int r;
 
         r = terminal_urlify_man("systemd-ssh-issue", "1", &link);
         if (r < 0)
                 return log_oom();
 
-        printf("%s [OPTIONS...] --make-vsock\n"
-               "%s [OPTIONS...] --rm-vsock\n"
-               "\n%sCreate ssh /run/issue.d/ file reporting VSOCK address.%s\n\n"
-               "  -h --help            Show this help\n"
-               "     --version         Show package version\n"
-               "     --issue-path=PATH Change path to /run/issue.d/50-ssh-vsock.issue\n"
-               "\nSee the %s for details.\n",
-               program_invocation_short_name,
+        r = option_parser_get_help_table(&options);
+        if (r < 0)
+                return r;
+
+        printf("%1$s [OPTIONS...] --make-vsock\n"
+               "%1$s [OPTIONS...] --rm-vsock\n"
+               "\n%2$sCreate ssh /run/issue.d/ file reporting VSOCK address.%3$s\n\n",
                program_invocation_short_name,
                ansi_highlight(),
-               ansi_normal(),
-               link);
+               ansi_normal());
+
+        r = table_print_or_warn(options);
+        if (r < 0)
+                return r;
 
+        printf("\nSee the %s for details.\n", link);
         return 0;
 }
 
 static int parse_argv(int argc, char *argv[]) {
-
-        enum {
-                ARG_MAKE_VSOCK = 0x100,
-                ARG_RM_VSOCK,
-                ARG_ISSUE_PATH,
-                ARG_VERSION,
-        };
-
-        static const struct option options[] = {
-                { "help",       no_argument,       NULL, 'h'            },
-                { "version",    no_argument,       NULL, ARG_VERSION    },
-                { "make-vsock", no_argument,       NULL, ARG_MAKE_VSOCK },
-                { "rm-vsock",   no_argument,       NULL, ARG_RM_VSOCK   },
-                { "issue-path", required_argument, NULL, ARG_ISSUE_PATH },
-                {}
-        };
-
-        int c, r;
-
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) {
+        OptionParser state = { argc, argv };
+        const char *arg;
+        int r;
 
+        FOREACH_OPTION(&state, c, &arg, /* on_error= */ return c)
                 switch (c) {
 
-                case 'h':
+                OPTION_COMMON_HELP:
                         return help();
 
-                case ARG_VERSION:
+                OPTION_COMMON_VERSION:
                         return version();
 
-                case ARG_MAKE_VSOCK:
+                OPTION_LONG("make-vsock", NULL, "Generate the issue file (default)"):
                         arg_action = ACTION_MAKE_VSOCK;
                         break;
 
-                case ARG_RM_VSOCK:
+                OPTION_LONG("rm-vsock", NULL, "Remove the issue file"):
                         arg_action = ACTION_RM_VSOCK;
                         break;
 
-                case ARG_ISSUE_PATH:
-                        if (empty_or_dash(optarg)) {
+                OPTION_LONG("issue-path", "PATH",
+                            "Change path to /run/issue.d/50-ssh-vsock.issue"):
+                        if (empty_or_dash(arg)) {
                                 arg_issue_path = mfree(arg_issue_path);
                                 arg_issue_stdout = true;
                                 break;
                         }
 
-                        r = parse_path_argument(optarg, /* suppress_root= */ false, &arg_issue_path);
+                        r = parse_path_argument(arg, /* suppress_root= */ false, &arg_issue_path);
                         if (r < 0)
                                 return r;
 
                         arg_issue_stdout = false;
                         break;
                 }
-        }
 
         if (!arg_issue_path && !arg_issue_stdout) {
                 arg_issue_path = strdup("/run/issue.d/50-ssh-vsock.issue");