From: Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date: Thu, 16 Apr 2026 08:23:25 +0000 (+0200)
Subject: hibernate-resume: convert to the new option parser
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1db7a4d3b365aa39ab500615a06ea8e1c54b7394;p=thirdparty%2Fsystemd.git

hibernate-resume: convert to the new option parser

--help is the same except for whitespace.

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

diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index 2c6eed3248a..cc48bf22fb3 100644
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -1,20 +1,22 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include <getopt.h>
 #include <sys/stat.h>
 
 #include "alloc-util.h"
 #include "build.h"
 #include "devnum-util.h"
+#include "format-table.h"
 #include "hibernate-resume-config.h"
 #include "hibernate-util.h"
 #include "initrd-util.h"
 #include "log.h"
 #include "main-func.h"
+#include "options.h"
 #include "parse-util.h"
 #include "pretty-print.h"
 #include "stat-util.h"
 #include "static-destruct.h"
+#include "strv.h"
 
 static HibernateInfo arg_info = {};
 static bool arg_clear = false;
@@ -23,70 +25,59 @@ STATIC_DESTRUCTOR_REGISTER(arg_info, hibernate_info_done);
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;
+        _cleanup_(table_unrefp) Table *options = NULL;
         int r;
 
         r = terminal_urlify_man("systemd-hibernate-resume", "8", &link);
         if (r < 0)
                 return log_oom();
 
-        printf("%s [OPTIONS...] [DEVICE [OFFSET]]\n"
-               "\n%sInitiate resume from hibernation.%s\n\n"
-               "  -h --help            Show this help\n"
-               "     --version         Show package version\n"
-               "     --clear           Clear hibernation storage information from EFI and exit\n"
-               "\nSee the %s for details.\n",
+        r = option_parser_get_help_table(&options);
+        if (r < 0)
+                return r;
+
+        printf("%s [OPTIONS...] [DEVICE [OFFSET]]\n\n"
+               "%sInitiate resume from hibernation.%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_VERSION = 0x100,
-                ARG_CLEAR,
-        };
-
-        static const struct option options[] = {
-                { "help",      no_argument,       NULL, 'h'           },
-                { "version",   no_argument,       NULL, ARG_VERSION   },
-                { "clear",     no_argument,       NULL, ARG_CLEAR     },
-                {}
-        };
-
-        int c;
-
+static int parse_argv(int argc, char *argv[], char ***ret_args) {
         assert(argc >= 0);
         assert(argv);
+        assert(ret_args);
 
-        while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
+        OptionParser state = { argc, argv };
+        const char *arg;
 
+        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_CLEAR:
+                OPTION_LONG("clear", NULL,
+                            "Clear hibernation storage information from EFI and exit"):
                         arg_clear = true;
                         break;
-
-                case '?':
-                        return -EINVAL;
-
-                default:
-                        assert_not_reached();
                 }
 
-        if (argc > optind && arg_clear)
+        if (option_parser_get_n_args(&state) > 0 && arg_clear)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "Extraneous arguments specified with --clear, refusing.");
 
+        *ret_args = option_parser_get_args(&state);
         return 1;
 }
 
@@ -130,11 +121,14 @@ static int run(int argc, char *argv[]) {
 
         log_setup();
 
-        r = parse_argv(argc, argv);
+        char **args = NULL;
+        r = parse_argv(argc, argv, &args);
         if (r <= 0)
                 return r;
 
-        if (argc - optind > 2)
+        size_t n_args = strv_length(args);
+
+        if (n_args > 2)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program expects zero, one, or two arguments.");
 
         umask(0022);
@@ -146,7 +140,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(ENOTRECOVERABLE),
                                        "Not running in initrd, refusing to initiate resume from hibernation.");
 
-        if (argc <= optind) {
+        if (n_args == 0) {
                 r = setup_hibernate_info_and_warn();
                 if (r <= 0)
                         return r;
@@ -154,12 +148,12 @@ static int run(int argc, char *argv[]) {
                 if (arg_info.efi)
                         (void) clear_efi_hibernate_location_and_warn();
         } else {
-                arg_info.device = ASSERT_PTR(argv[optind]);
+                arg_info.device = ASSERT_PTR(args[0]);
 
-                if (argc - optind == 2) {
-                        r = safe_atou64(argv[optind + 1], &arg_info.offset);
+                if (n_args == 2) {
+                        r = safe_atou64(args[1], &arg_info.offset);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to parse resume offset %s: %m", argv[optind + 1]);
+                                return log_error_errno(r, "Failed to parse resume offset %s: %m", args[1]);
                 }
         }