From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Tue, 28 Apr 2026 09:28:35 +0000 (+0200)
Subject: udevadm-settle: convert to OPTION macros
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed2b92e2057a4bdae32ab7c81480a3a6c70e2487;p=thirdparty%2Fsystemd.git

udevadm-settle: convert to OPTION macros

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

diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
index b71759dc818..1292462d28c 100644
--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
@@ -4,7 +4,6 @@
  * Copyright © 2009 Scott James Remnant <scott@netsplit.com>
  */
 
-#include <getopt.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
@@ -14,6 +13,9 @@
 
 #include "alloc-util.h"
 #include "bus-util.h"
+#include "format-table.h"
+#include "help-util.h"
+#include "options.h"
 #include "path-util.h"
 #include "string-util.h"
 #include "strv.h"
@@ -28,60 +30,63 @@ static usec_t arg_timeout_usec = 120 * USEC_PER_SEC;
 static const char *arg_exists = NULL;
 
 static int help(void) {
-        printf("%s settle [OPTIONS]\n\n"
-               "Wait for pending udev events.\n\n"
-               "  -h --help                 Show this help\n"
-               "  -V --version              Show package version\n"
-               "  -t --timeout=SEC          Maximum time to wait for events\n"
-               "  -E --exit-if-exists=FILE  Stop waiting if file exists\n",
-               program_invocation_short_name);
+        _cleanup_(table_unrefp) Table *options = NULL;
+        int r;
+
+        r = option_parser_get_help_table_ns("udevadm-settle", &options);
+        if (r < 0)
+                return r;
 
+        help_cmdline("settle [OPTIONS]");
+        help_abstract("Wait for pending udev events.");
+        help_section("Options:");
+        r = table_print_or_warn(options);
+        if (r < 0)
+                return r;
+
+        help_man_page_reference("udevadm", "8");
         return 0;
 }
 
 static int parse_argv(int argc, char *argv[]) {
-        static const struct option options[] = {
-                { "timeout",        required_argument, NULL, 't' },
-                { "exit-if-exists", required_argument, NULL, 'E' },
-                { "version",        no_argument,       NULL, 'V' },
-                { "help",           no_argument,       NULL, 'h' },
-                { "seq-start",      required_argument, NULL, 's' }, /* removed */
-                { "seq-end",        required_argument, NULL, 'e' }, /* removed */
-                { "quiet",          no_argument,       NULL, 'q' }, /* removed */
-                {}
-        };
-
-        int c, r;
-
-        while ((c = getopt_long(argc, argv, "t:E:Vhs:e:q", options, NULL)) >= 0) {
+        int r;
+
+        assert(argc >= 0);
+        assert(argv);
+
+        OptionParser opts = { argc, argv, .namespace = "udevadm-settle" };
+
+        FOREACH_OPTION(c, &opts, /* on_error= */ return c)
                 switch (c) {
-                case 't':
-                        r = parse_sec(optarg, &arg_timeout_usec);
+
+                OPTION_NAMESPACE("udevadm-settle"): {}
+
+                OPTION_COMMON_HELP:
+                        return help();
+
+                OPTION('V', "version", NULL, "Show package version"):
+                        return print_version();
+
+                OPTION('t', "timeout", "SEC", "Maximum time to wait for events"):
+                        r = parse_sec(opts.arg, &arg_timeout_usec);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to parse timeout value '%s': %m", optarg);
+                                return log_error_errno(r, "Failed to parse timeout value '%s': %m", opts.arg);
                         break;
-                case 'E':
-                        if (!path_is_valid(optarg))
-                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid path: %s", optarg);
 
-                        arg_exists = optarg;
+                OPTION('E', "exit-if-exists", "FILE", "Stop waiting if file exists"):
+                        if (!path_is_valid(opts.arg))
+                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid path: %s", opts.arg);
+
+                        arg_exists = opts.arg;
                         break;
-                case 'V':
-                        return print_version();
-                case 'h':
-                        return help();
-                case 's':
-                case 'e':
-                case 'q':
+
+                OPTION('s', "seq-start", "ARG", NULL): {} /* removed */
+                OPTION('e', "seq-end", "ARG", NULL): {} /* removed */
+                OPTION('q', "quiet", NULL, NULL): /* removed */
                         return log_info_errno(SYNTHETIC_ERRNO(EINVAL),
                                               "Option -%c no longer supported.",
-                                              c);
-                case '?':
-                        return -EINVAL;
-                default:
-                        assert_not_reached();
+                                              opts.opt->short_code);
                 }
-        }
 
         return 1;
 }