mtd_probe: convert to the new option parser
The commandline check is tightened. Previously the program would crash if called without an argument. Co-developed-by: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -19,48 +19,59 @@
|
||||
*/
|
||||
|
||||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
#include <mtd/mtd-user.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#include "build.h"
|
||||
#include "errno-util.h"
|
||||
#include "fd-util.h"
|
||||
#include "format-table.h"
|
||||
#include "help-util.h"
|
||||
#include "log.h"
|
||||
#include "main-func.h"
|
||||
#include "mtd_probe.h"
|
||||
#include "options.h"
|
||||
#include "strv.h"
|
||||
|
||||
static const char *arg_device = NULL;
|
||||
|
||||
static int parse_argv(int argc, char *argv[]) {
|
||||
static const struct option options[] = {
|
||||
{ "help", no_argument, NULL, 'h' },
|
||||
{ "version", no_argument, NULL, 'v' },
|
||||
{}
|
||||
};
|
||||
int c;
|
||||
static int help(void) {
|
||||
_cleanup_(table_unrefp) Table *options = NULL;
|
||||
int r;
|
||||
|
||||
while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0)
|
||||
r = option_parser_get_help_table(&options);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
help_cmdline("[OPTIONS...] /dev/mtd[n]");
|
||||
help_abstract("Probe MTD devices.");
|
||||
help_section("Options:");
|
||||
|
||||
return table_print_or_warn(options);
|
||||
}
|
||||
|
||||
static int parse_argv(int argc, char *argv[]) {
|
||||
assert(argc >= 0);
|
||||
assert(argv);
|
||||
|
||||
OptionParser state = { argc, argv };
|
||||
const char *arg;
|
||||
|
||||
FOREACH_OPTION(&state, c, &arg, /* on_error= */ return c)
|
||||
switch (c) {
|
||||
case 'h':
|
||||
printf("%s /dev/mtd[n]\n\n"
|
||||
" -h --help Show this help text\n"
|
||||
" --version Show package version\n",
|
||||
program_invocation_short_name);
|
||||
return 0;
|
||||
case 'v':
|
||||
|
||||
OPTION_COMMON_HELP:
|
||||
return help();
|
||||
|
||||
OPTION_COMMON_VERSION:
|
||||
return version();
|
||||
case '?':
|
||||
return -EINVAL;
|
||||
default:
|
||||
assert_not_reached();
|
||||
}
|
||||
|
||||
if (argc > 2)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Error: unexpected argument.");
|
||||
char **args = option_parser_get_args(&state);
|
||||
if (strv_length(args) != 1)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Need exactly one DEVICE argument.");
|
||||
|
||||
arg_device = argv[optind];
|
||||
arg_device = args[0];
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -73,12 +84,12 @@ static int run(int argc, char** argv) {
|
||||
if (r <= 0)
|
||||
return r;
|
||||
|
||||
mtd_fd = open(argv[1], O_RDONLY|O_CLOEXEC|O_NOCTTY);
|
||||
mtd_fd = open(arg_device, O_RDONLY|O_CLOEXEC|O_NOCTTY);
|
||||
if (mtd_fd < 0) {
|
||||
bool ignore = ERRNO_IS_DEVICE_ABSENT_OR_EMPTY(errno);
|
||||
log_full_errno(ignore ? LOG_DEBUG : LOG_WARNING, errno,
|
||||
"Failed to open device node '%s'%s: %m",
|
||||
argv[1], ignore ? ", ignoring" : "");
|
||||
arg_device, ignore ? ", ignoring" : "");
|
||||
return ignore ? 0 : -errno;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user