hostnamectl: use dispatch_verb()
This commit is contained in:
Yu Watanabe
parent
a456324fef
commit
f46bc484f7
|
|
@ -34,6 +34,7 @@
|
|||
#include "hostname-util.h"
|
||||
#include "spawn-polkit-agent.h"
|
||||
#include "util.h"
|
||||
#include "verbs.h"
|
||||
|
||||
static bool arg_ask_password = true;
|
||||
static BusTransport arg_transport = BUS_TRANSPORT_LOCAL;
|
||||
|
|
@ -200,11 +201,10 @@ fail:
|
|||
return r;
|
||||
}
|
||||
|
||||
static int show_status(sd_bus *bus, char **args, unsigned n) {
|
||||
static int show_status(int argc, char **argv, void *userdata) {
|
||||
sd_bus *bus = userdata;
|
||||
int r;
|
||||
|
||||
assert(args);
|
||||
|
||||
if (arg_pretty || arg_static || arg_transient) {
|
||||
const char *attr;
|
||||
|
||||
|
|
@ -247,14 +247,12 @@ static int set_simple_string(sd_bus *bus, const char *method, const char *value)
|
|||
return r;
|
||||
}
|
||||
|
||||
static int set_hostname(sd_bus *bus, char **args, unsigned n) {
|
||||
static int set_hostname(int argc, char **argv, void *userdata) {
|
||||
_cleanup_free_ char *h = NULL;
|
||||
const char *hostname = args[1];
|
||||
const char *hostname = argv[1];
|
||||
sd_bus *bus = userdata;
|
||||
int r;
|
||||
|
||||
assert(args);
|
||||
assert(n == 2);
|
||||
|
||||
if (!arg_pretty && !arg_static && !arg_transient)
|
||||
arg_pretty = arg_static = arg_transient = true;
|
||||
|
||||
|
|
@ -301,35 +299,23 @@ static int set_hostname(sd_bus *bus, char **args, unsigned n) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int set_icon_name(sd_bus *bus, char **args, unsigned n) {
|
||||
assert(args);
|
||||
assert(n == 2);
|
||||
|
||||
return set_simple_string(bus, "SetIconName", args[1]);
|
||||
static int set_icon_name(int argc, char **argv, void *userdata) {
|
||||
return set_simple_string(userdata, "SetIconName", argv[1]);
|
||||
}
|
||||
|
||||
static int set_chassis(sd_bus *bus, char **args, unsigned n) {
|
||||
assert(args);
|
||||
assert(n == 2);
|
||||
|
||||
return set_simple_string(bus, "SetChassis", args[1]);
|
||||
static int set_chassis(int argc, char **argv, void *userdata) {
|
||||
return set_simple_string(userdata, "SetChassis", argv[1]);
|
||||
}
|
||||
|
||||
static int set_deployment(sd_bus *bus, char **args, unsigned n) {
|
||||
assert(args);
|
||||
assert(n == 2);
|
||||
|
||||
return set_simple_string(bus, "SetDeployment", args[1]);
|
||||
static int set_deployment(int argc, char **argv, void *userdata) {
|
||||
return set_simple_string(userdata, "SetDeployment", argv[1]);
|
||||
}
|
||||
|
||||
static int set_location(sd_bus *bus, char **args, unsigned n) {
|
||||
assert(args);
|
||||
assert(n == 2);
|
||||
|
||||
return set_simple_string(bus, "SetLocation", args[1]);
|
||||
static int set_location(int argc, char **argv, void *userdata) {
|
||||
return set_simple_string(userdata, "SetLocation", argv[1]);
|
||||
}
|
||||
|
||||
static void help(void) {
|
||||
static int help(void) {
|
||||
printf("%s [OPTIONS...] COMMAND ...\n\n"
|
||||
"Query or change system hostname.\n\n"
|
||||
" -h --help Show this help\n"
|
||||
|
|
@ -348,6 +334,12 @@ static void help(void) {
|
|||
" set-deployment NAME Set deployment environment for host\n"
|
||||
" set-location NAME Set location for host\n"
|
||||
, program_invocation_short_name);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int verb_help(int argc, char **argv, void *userdata) {
|
||||
return help();
|
||||
}
|
||||
|
||||
static int parse_argv(int argc, char *argv[]) {
|
||||
|
|
@ -382,8 +374,7 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
switch (c) {
|
||||
|
||||
case 'h':
|
||||
help();
|
||||
return 0;
|
||||
return help();
|
||||
|
||||
case ARG_VERSION:
|
||||
return version();
|
||||
|
|
@ -426,82 +417,18 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
|
||||
static int hostnamectl_main(sd_bus *bus, int argc, char *argv[]) {
|
||||
|
||||
static const struct {
|
||||
const char* verb;
|
||||
const enum {
|
||||
MORE,
|
||||
LESS,
|
||||
EQUAL
|
||||
} argc_cmp;
|
||||
const int argc;
|
||||
int (* const dispatch)(sd_bus *bus, char **args, unsigned n);
|
||||
} verbs[] = {
|
||||
{ "status", LESS, 1, show_status },
|
||||
{ "set-hostname", EQUAL, 2, set_hostname },
|
||||
{ "set-icon-name", EQUAL, 2, set_icon_name },
|
||||
{ "set-chassis", EQUAL, 2, set_chassis },
|
||||
{ "set-deployment", EQUAL, 2, set_deployment },
|
||||
{ "set-location", EQUAL, 2, set_location },
|
||||
static const Verb verbs[] = {
|
||||
{ "status", VERB_ANY, 1, VERB_DEFAULT, show_status },
|
||||
{ "set-hostname", 2, 2, 0, set_hostname },
|
||||
{ "set-icon-name", 2, 2, 0, set_icon_name },
|
||||
{ "set-chassis", 2, 2, 0, set_chassis },
|
||||
{ "set-deployment", 2, 2, 0, set_deployment },
|
||||
{ "set-location", 2, 2, 0, set_location },
|
||||
{ "help", VERB_ANY, VERB_ANY, 0, verb_help }, /* Not documented, but supported since it is created. */
|
||||
{}
|
||||
};
|
||||
|
||||
int left;
|
||||
unsigned i;
|
||||
|
||||
assert(argc >= 0);
|
||||
assert(argv);
|
||||
|
||||
left = argc - optind;
|
||||
|
||||
if (left <= 0)
|
||||
/* Special rule: no arguments means "status" */
|
||||
i = 0;
|
||||
else {
|
||||
if (streq(argv[optind], "help")) {
|
||||
help();
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (i = 0; i < ELEMENTSOF(verbs); i++)
|
||||
if (streq(argv[optind], verbs[i].verb))
|
||||
break;
|
||||
|
||||
if (i >= ELEMENTSOF(verbs)) {
|
||||
log_error("Unknown operation %s", argv[optind]);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
switch (verbs[i].argc_cmp) {
|
||||
|
||||
case EQUAL:
|
||||
if (left != verbs[i].argc) {
|
||||
log_error("Invalid number of arguments.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case MORE:
|
||||
if (left < verbs[i].argc) {
|
||||
log_error("Too few arguments.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case LESS:
|
||||
if (left > verbs[i].argc) {
|
||||
log_error("Too many arguments.");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
default:
|
||||
assert_not_reached("Unknown comparison operator.");
|
||||
}
|
||||
|
||||
return verbs[i].dispatch(bus, argv + optind, left);
|
||||
return dispatch_verb(argc, argv, verbs, bus);
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue