SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

battery-check: convert to the new option parser

Browse Source 
--help is identical except for whitespace changes.

Co-developed-by: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-04-07 10:55:53 +02:00
parent 3ec64fa2ba
commit c074adda05
1 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battery-check/battery-check.c
+20 -31
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <sys/socket.h> /* IWYU pragma: keep */
#include "sd-messages.h"
@@ -9,9 +8,11 @@
#include "battery-util.h"
#include "build.h"
#include "fd-util.h"
#include "format-table.h"
#include "glyph-util.h"
#include "log.h"
#include "main-func.h"
#include "options.h"
#include "plymouth-util.h"
#include "pretty-print.h"
#include "proc-cmdline.h"
@@ -27,22 +28,28 @@ static bool arg_doit = true;
static int help(void) {
_cleanup_free_ char *link = NULL;
_cleanup_(table_unrefp) Table *options = NULL;
int r;
r = terminal_urlify_man("systemd-battery-check", "8", &link);
if (r < 0)
return log_oom();
r = option_parser_get_help_table(&options);
if (r < 0)
return r;
printf("%s\n\n"
"%sCheck battery level to see whether there's enough charge.%s\n\n"
" -h --help Show this help\n"
" --version Show package version\n"
"\nSee the %s for details.\n",
"%sCheck battery level to see whether there's enough charge.%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;
}
@@ -70,41 +77,23 @@ static int plymouth_send_message(const char *mode, const char *message) {
return 0;
}
static int parse_argv(int argc, char * argv[]) {
enum {
ARG_VERSION = 0x100,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{}
};
int c;
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
OptionParser state = { argc, argv };
FOREACH_OPTION(&state, c, /* ret_a= */ NULL, /* on_error= */ return c)
switch (c) {
case 'h':
OPTION_COMMON_HELP:
return help();
case ARG_VERSION:
OPTION_COMMON_VERSION:
return version();
case '?':
return -EINVAL;
default:
assert_not_reached();
}
if (optind < argc)
if (option_parser_get_n_args(&state) != 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"%s takes no argument.",
program_invocation_short_name);