X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fsystemctl%2Fsystemctl.c;h=01a4489f4d09e4ed82feaa761965827ecfd42d71;hp=f3db6bfdbf1722f556ad93ab8ecce045cabd892a;hb=39602c3905da5196987b4df744541295ada725ae;hpb=f168c27313e4d7b0aabee037dc9c78a5799f0597 diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index f3db6bfdb..01a4489f4 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "sd-daemon.h" #include "sd-shutdown.h" @@ -82,6 +83,7 @@ static enum dependency { DEPENDENCY_REVERSE, DEPENDENCY_AFTER, DEPENDENCY_BEFORE, + _DEPENDENCY_MAX } arg_dependency = DEPENDENCY_FORWARD; static const char *arg_job_mode = "replace"; static UnitFileScope arg_scope = UNIT_FILE_SYSTEM; @@ -133,12 +135,34 @@ static char *arg_host = NULL; static unsigned arg_lines = 10; static OutputMode arg_output = OUTPUT_SHORT; static bool arg_plain = false; +static const struct { + const char *verb; + const char *method; +} unit_actions[] = { + { "start", "StartUnit" }, + { "stop", "StopUnit" }, + { "condstop", "StopUnit" }, + { "reload", "ReloadUnit" }, + { "restart", "RestartUnit" }, + { "try-restart", "TryRestartUnit" }, + { "condrestart", "TryRestartUnit" }, + { "reload-or-restart", "ReloadOrRestartUnit" }, + { "reload-or-try-restart", "ReloadOrTryRestartUnit" }, + { "condreload", "ReloadOrTryRestartUnit" }, + { "force-reload", "ReloadOrTryRestartUnit" } +}; static int daemon_reload(sd_bus *bus, char **args); static int halt_now(enum action a); static int check_one_unit(sd_bus *bus, const char *name, const char *good_states, bool quiet); +static char** strv_skip_first(char **strv) { + if (strv_length(strv) > 0) + return strv + 1; + return NULL; +} + static void pager_open_if_enabled(void) { if (arg_no_pager) @@ -279,7 +303,7 @@ static int compare_unit_info(const void *a, const void *b) { return strcasecmp(u->id, v->id); } -static bool output_show_unit(const UnitInfo *u) { +static bool output_show_unit(const UnitInfo *u, char **patterns) { const char *dot; if (!strv_isempty(arg_states)) @@ -288,6 +312,15 @@ static bool output_show_unit(const UnitInfo *u) { strv_contains(arg_states, u->sub_state) || strv_contains(arg_states, u->active_state); + if (!strv_isempty(patterns)) { + char **pattern; + + STRV_FOREACH(pattern, patterns) + if (fnmatch(*pattern, u->id, FNM_NOESCAPE) == 0) + return true; + return false; + } + return (!arg_types || ((dot = strrchr(u->id, '.')) && strv_find(arg_types, dot+1))) && (arg_all || !(streq(u->active_state, "inactive") @@ -308,9 +341,6 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { desc_len = 0; for (u = unit_infos; u < unit_infos + c; u++) { - if (!output_show_unit(u)) - continue; - max_id_len = MAX(max_id_len, strlen(u->id)); load_len = MAX(load_len, strlen(u->load_state)); active_len = MAX(active_len, strlen(u->active_state)); @@ -357,9 +387,6 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { const char *on_loaded, *off_loaded, *on = ""; const char *on_active, *off_active, *off = ""; - if (!output_show_unit(u)) - continue; - if (!n_shown && !arg_no_legend) { printf("%-*s %-*s %-*s %-*s ", id_len, "UNIT", @@ -410,12 +437,10 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { const char *on, *off; if (n_shown) { - printf("\nLOAD = Reflects whether the unit definition was properly loaded.\n" - "ACTIVE = The high-level unit activation state, i.e. generalization of SUB.\n" - "SUB = The low-level unit activation state, values depend on unit type.\n"); - if (job_count) - printf("JOB = Pending job for the unit.\n"); - puts(""); + puts("\nLOAD = Reflects whether the unit definition was properly loaded.\n" + "ACTIVE = The high-level unit activation state, i.e. generalization of SUB.\n" + "SUB = The low-level unit activation state, values depend on unit type."); + puts(job_count ? "JOB = Pending job for the unit.\n" : ""); on = ansi_highlight(); off = ansi_highlight_off(); } else { @@ -437,7 +462,8 @@ static void output_units_list(const UnitInfo *unit_infos, unsigned c) { static int get_unit_list( sd_bus *bus, sd_bus_message **_reply, - UnitInfo **_unit_infos) { + UnitInfo **_unit_infos, + char **patterns) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; @@ -469,6 +495,8 @@ static int get_unit_list( return bus_log_parse_error(r); while ((r = bus_parse_unit_info(reply, &u)) > 0) { + if (!output_show_unit(&u, patterns)) + continue; if (!GREEDY_REALLOC(unit_infos, size, c+1)) return log_oom(); @@ -498,7 +526,7 @@ static int list_units(sd_bus *bus, char **args) { pager_open_if_enabled(); - r = get_unit_list(bus, &reply, &unit_infos); + r = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); if (r < 0) return r; @@ -675,7 +703,7 @@ static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) { static int list_sockets(sd_bus *bus, char **args) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_free_ UnitInfo *unit_infos = NULL; - struct socket_info *socket_infos = NULL; + _cleanup_free_ struct socket_info *socket_infos = NULL; const UnitInfo *u; struct socket_info *s; unsigned cs = 0; @@ -684,7 +712,7 @@ static int list_sockets(sd_bus *bus, char **args) { pager_open_if_enabled(); - n = get_unit_list(bus, &reply, &unit_infos); + n = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); if (n < 0) return n; @@ -692,9 +720,6 @@ static int list_sockets(sd_bus *bus, char **args) { _cleanup_strv_free_ char **listening = NULL, **triggered = NULL; int i, c; - if (!output_show_unit(u)) - continue; - if (!endswith(u->id, ".socket")) continue; @@ -741,7 +766,6 @@ static int list_sockets(sd_bus *bus, char **args) { if (s->own_triggered) strv_free(s->triggered); } - free(socket_infos); return r; } @@ -898,7 +922,7 @@ static int list_timers(sd_bus *bus, char **args) { pager_open_if_enabled(); - n = get_unit_list(bus, &reply, &unit_infos); + n = get_unit_list(bus, &reply, &unit_infos, strv_skip_first(args)); if (n < 0) return n; @@ -909,9 +933,6 @@ static int list_timers(sd_bus *bus, char **args) { dual_timestamp next; usec_t m; - if (!output_show_unit(u)) - continue; - if (!endswith(u->id, ".timer")) continue; @@ -979,12 +1000,21 @@ static int compare_unit_file_list(const void *a, const void *b) { return r; } - return strcasecmp(path_get_file_name(u->path), path_get_file_name(v->path)); + return strcasecmp(basename(u->path), basename(v->path)); } -static bool output_show_unit_file(const UnitFileList *u) { +static bool output_show_unit_file(const UnitFileList *u, char **patterns) { const char *dot; + if (!strv_isempty(patterns)) { + char **pattern; + + STRV_FOREACH(pattern, patterns) + if (fnmatch(*pattern, basename(u->path), FNM_NOESCAPE) == 0) + return true; + return false; + } + return !arg_types || ((dot = strrchr(u->path, '.')) && strv_find(arg_types, dot+1)); } @@ -996,10 +1026,7 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) { state_cols = sizeof("STATE")-1; for (u = units; u < units + c; u++) { - if (!output_show_unit_file(u)) - continue; - - max_id_len = MAX(max_id_len, strlen(path_get_file_name(u->path))); + max_id_len = MAX(max_id_len, strlen(basename(u->path))); state_cols = MAX(state_cols, strlen(unit_file_state_to_string(u->state))); } @@ -1023,9 +1050,6 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) { const char *on, *off; const char *id; - if (!output_show_unit_file(u)) - continue; - n_shown++; if (u->state == UNIT_FILE_MASKED || @@ -1040,7 +1064,7 @@ static void output_unit_file_list(const UnitFileList *units, unsigned c) { } else on = off = ""; - id = path_get_file_name(u->path); + id = basename(u->path); e = arg_full ? NULL : ellipsize(id, id_cols, 33); @@ -1057,6 +1081,8 @@ static int list_unit_files(sd_bus *bus, char **args) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_free_ UnitFileList *units = NULL; + UnitFileList *unit; + size_t size = 0; unsigned c = 0; const char *state; char *path; @@ -1089,15 +1115,16 @@ static int list_unit_files(sd_bus *bus, char **args) { } HASHMAP_FOREACH(u, h, i) { - memcpy(units + c++, u, sizeof(UnitFileList)); + if (!output_show_unit_file(u, strv_skip_first(args))) + continue; + + units[c++] = *u; free(u); } - assert(c == n_units); + assert(c <= n_units); hashmap_free(h); } else { - size_t size = 0; - r = sd_bus_call_method( bus, "org.freedesktop.systemd1", @@ -1121,10 +1148,14 @@ static int list_unit_files(sd_bus *bus, char **args) { if (!GREEDY_REALLOC(units, size, c + 1)) return log_oom(); - units[c++] = (struct UnitFileList) { + units[c] = (struct UnitFileList) { path, unit_file_state_from_string(state) }; + + if (output_show_unit_file(&units[c], strv_skip_first(args))) + c ++; + } if (r < 0) return bus_log_parse_error(r); @@ -1139,6 +1170,10 @@ static int list_unit_files(sd_bus *bus, char **args) { output_unit_file_list(units, c); } + if (avoid_bus()) + for (unit = units; unit < units + c; unit++) + free(unit->path); + return 0; } @@ -1183,7 +1218,7 @@ static int list_dependencies_print(const char *name, int level, unsigned int bra static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, char ***deps) { - static const char *dependencies[] = { + static const char *dependencies[_DEPENDENCY_MAX] = { [DEPENDENCY_FORWARD] = "Requires\0" "RequiresOverridable\0" "Requisite\0" @@ -1206,7 +1241,7 @@ static int list_dependencies_get_dependencies(sd_bus *bus, const char *name, cha assert(bus); assert(name); assert(deps); - assert(arg_dependency < ELEMENTSOF(dependencies)); + assert_cc(ELEMENTSOF(dependencies) == _DEPENDENCY_MAX); path = unit_dbus_path_from_name(name); if (!path) @@ -1356,7 +1391,7 @@ static int list_dependencies(sd_bus *bus, char **args) { assert(bus); if (args[1]) { - unit = unit_name_mangle(args[1]); + unit = unit_name_mangle(args[1], MANGLE_NOGLOB); if (!unit) return log_oom(); u = unit; @@ -1456,7 +1491,7 @@ static int set_default(sd_bus *bus, char **args) { unsigned n_changes = 0; int r; - unit = unit_name_mangle_with_suffix(args[1], ".target"); + unit = unit_name_mangle_with_suffix(args[1], MANGLE_NOGLOB, ".target"); if (!unit) return log_oom(); @@ -1510,7 +1545,7 @@ struct job_info { const char *name, *type, *state; }; -static void output_jobs_list(const struct job_info* jobs, unsigned n) { +static void output_jobs_list(const struct job_info* jobs, unsigned n, bool skipped) { unsigned id_len, unit_len, type_len, state_len; const struct job_info *j; const char *on, *off; @@ -1522,7 +1557,7 @@ static void output_jobs_list(const struct job_info* jobs, unsigned n) { on = ansi_highlight_green(); off = ansi_highlight_off(); - printf("%sNo jobs running.%s\n", on, off); + printf("%sNo jobs %s.%s\n", on, skipped ? "listed" : "running", off); return; } @@ -1580,6 +1615,19 @@ static void output_jobs_list(const struct job_info* jobs, unsigned n) { } } +static bool output_show_job(struct job_info *job, char **patterns) { + if (!strv_isempty(patterns)) { + char **pattern; + + STRV_FOREACH(pattern, patterns) + if (fnmatch(*pattern, job->name, FNM_NOESCAPE) == 0) + return true; + return false; + } + + return true; +} + static int list_jobs(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; @@ -1589,6 +1637,7 @@ static int list_jobs(sd_bus *bus, char **args) { unsigned c = 0; uint32_t id; int r; + bool skipped = false; r = sd_bus_call_method( bus, @@ -1609,16 +1658,17 @@ static int list_jobs(sd_bus *bus, char **args) { return bus_log_parse_error(r); while ((r = sd_bus_message_read(reply, "(usssoo)", &id, &name, &type, &state, &job_path, &unit_path)) > 0) { + struct job_info job = { id, name, type, state }; + + if (!output_show_job(&job, strv_skip_first(args))) { + skipped = true; + continue; + } if (!GREEDY_REALLOC(jobs, size, c + 1)) return log_oom(); - jobs[c++] = (struct job_info) { - id, - name, - type, - state - }; + jobs[c++] = job; } if (r < 0) return bus_log_parse_error(r); @@ -1627,7 +1677,7 @@ static int list_jobs(sd_bus *bus, char **args) { if (r < 0) return bus_log_parse_error(r); - output_jobs_list(jobs, c); + output_jobs_list(jobs, c, skipped); return r; } @@ -1670,17 +1720,12 @@ static int cancel_job(sd_bus *bus, char **args) { static int need_daemon_reload(sd_bus *bus, const char *unit) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_free_ char *n = NULL; const char *path; int b, r; /* We ignore all errors here, since this is used to show a * warning only */ - n = unit_name_mangle(unit); - if (!n) - return -ENOMEM; - /* We don't use unit_dbus_path_from_name() directly since we * don't want to load the unit if it isn't loaded. */ @@ -1692,7 +1737,7 @@ static int need_daemon_reload(sd_bus *bus, const char *unit) { "GetUnit", NULL, &reply, - "s", n); + "s", unit); if (r < 0) return r; @@ -1802,59 +1847,89 @@ static int enable_wait_for_jobs(sd_bus *bus) { return 0; } +static int bus_process_wait(sd_bus *bus) { + int r; + + for (;;) { + r = sd_bus_process(bus, NULL); + if (r < 0) + return r; + if (r > 0) + return 0; + r = sd_bus_wait(bus, (uint64_t) -1); + if (r < 0) + return r; + } +} + +static int check_wait_response(WaitData *d) { + int r = 0; + + assert(d->result); + + if (!arg_quiet) { + if (streq(d->result, "timeout")) + log_error("Job for %s timed out.", strna(d->name)); + else if (streq(d->result, "canceled")) + log_error("Job for %s canceled.", strna(d->name)); + else if (streq(d->result, "dependency")) + log_error("A dependency job for %s failed. See 'journalctl -xn' for details.", strna(d->name)); + else if (!streq(d->result, "done") && !streq(d->result, "skipped")) + log_error("Job for %s failed. See 'systemctl status %s' and 'journalctl -xn' for details.", strna(d->name), strna(d->name)); + } + + if (streq(d->result, "timeout")) + r = -ETIME; + else if (streq(d->result, "canceled")) + r = -ECANCELED; + else if (streq(d->result, "dependency")) + r = -EIO; + else if (!streq(d->result, "done") && !streq(d->result, "skipped")) + r = -EIO; + + return r; +} + static int wait_for_jobs(sd_bus *bus, Set *s) { WaitData d = { .set = s }; - int r; + int r = 0, q; assert(bus); assert(s); - r = sd_bus_add_filter(bus, wait_filter, &d); - if (r < 0) + q = sd_bus_add_filter(bus, wait_filter, &d); + if (q < 0) return log_oom(); while (!set_isempty(s)) { - for (;;) { - r = sd_bus_process(bus, NULL); - if (r < 0) - return r; - if (r > 0) - break; - r = sd_bus_wait(bus, (uint64_t) -1); - if (r < 0) - return r; + q = bus_process_wait(bus); + if (q < 0) { + log_error("Failed to wait for response: %s", strerror(-r)); + return q; } - if (!d.result) - goto free_name; - - if (!arg_quiet) { - if (streq(d.result, "timeout")) - log_error("Job for %s timed out.", strna(d.name)); - else if (streq(d.result, "canceled")) - log_error("Job for %s canceled.", strna(d.name)); - else if (streq(d.result, "dependency")) - log_error("A dependency job for %s failed. See 'journalctl -xn' for details.", strna(d.name)); - else if (!streq(d.result, "done") && !streq(d.result, "skipped")) - log_error("Job for %s failed. See 'systemctl status %s' and 'journalctl -xn' for details.", strna(d.name), strna(d.name)); + if (d.result) { + q = check_wait_response(&d); + /* Return the first error as it is most likely to be + * meaningful. */ + if (q < 0 && r == 0) + r = q; + log_debug("Got result %s/%s for job %s", + strna(d.result), strerror(-q), strna(d.name)); } - if (streq_ptr(d.result, "timeout")) - r = -ETIME; - else if (streq_ptr(d.result, "canceled")) - r = -ECANCELED; - else if (!streq_ptr(d.result, "done") && !streq_ptr(d.result, "skipped")) - r = -EIO; + free(d.name); + d.name = NULL; free(d.result); d.result = NULL; - - free_name: - free(d.name); - d.name = NULL; } - return sd_bus_remove_filter(bus, wait_filter, &d); + q = sd_bus_remove_filter(bus, wait_filter, &d); + if (q < 0 && r == 0) + r = q; + + return r; } static int check_one_unit(sd_bus *bus, const char *name, const char *good_states, bool quiet) { @@ -1865,7 +1940,7 @@ static int check_one_unit(sd_bus *bus, const char *name, const char *good_states assert(name); - n = unit_name_mangle(name); + n = unit_name_mangle(name, MANGLE_NOGLOB); if (!n) return log_oom(); @@ -1922,7 +1997,7 @@ static int check_triggering_units( char **i; int r; - n = unit_name_mangle(name); + n = unit_name_mangle(name, MANGLE_NOGLOB); if (!n) return log_oom(); @@ -1980,6 +2055,26 @@ static int check_triggering_units( return 0; } +static const char *verb_to_method(const char *verb) { + uint i; + + for (i = 0; i < ELEMENTSOF(unit_actions); i++) + if (streq_ptr(unit_actions[i].verb, verb)) + return unit_actions[i].method; + + return "StartUnit"; +} + +static const char *method_to_verb(const char *method) { + uint i; + + for (i = 0; i < ELEMENTSOF(unit_actions); i++) + if (streq_ptr(unit_actions[i].method, method)) + return unit_actions[i].verb; + + return "n/a"; +} + static int start_unit_one( sd_bus *bus, const char *method, @@ -1989,7 +2084,6 @@ static int start_unit_one( Set *s) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - _cleanup_free_ char *n; const char *path; int r; @@ -1998,10 +2092,7 @@ static int start_unit_one( assert(mode); assert(error); - n = unit_name_mangle(name); - if (!n) - return log_oom(); - + log_debug("Calling manager for %s on %s, %s", method, name, mode); r = sd_bus_call_method( bus, "org.freedesktop.systemd1", @@ -2010,14 +2101,18 @@ static int start_unit_one( method, error, &reply, - "ss", n, mode); + "ss", name, mode); if (r < 0) { + const char *verb; + if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL) /* There's always a fallback possible for * legacy actions. */ return -EADDRNOTAVAIL; - log_error("Failed to start %s: %s", name, bus_error_message(error, r)); + verb = method_to_verb(method); + + log_error("Failed to %s %s: %s", verb, name, bus_error_message(error, r)); return r; } @@ -2025,9 +2120,9 @@ static int start_unit_one( if (r < 0) return bus_log_parse_error(r); - if (need_daemon_reload(bus, n) > 0) + if (need_daemon_reload(bus, name) > 0) log_warning("Warning: Unit file of %s changed on disk, 'systemctl%s daemon-reload' recommended.", - n, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); + name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); if (s) { char *p; @@ -2036,6 +2131,7 @@ static int start_unit_one( if (!p) return log_oom(); + log_debug("Adding %s to the set", p); r = set_consume(s, p); if (r < 0) return log_oom(); @@ -2044,6 +2140,52 @@ static int start_unit_one( return 0; } +static int expand_names(sd_bus *bus, char **names, const char* suffix, char ***ret) { + + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_strv_free_ char **mangled = NULL, **globs = NULL; + char **name; + int r = 0, i; + + STRV_FOREACH(name, names) { + char *t; + + if (suffix) + t = unit_name_mangle_with_suffix(*name, MANGLE_GLOB, suffix); + else + t = unit_name_mangle(*name, MANGLE_GLOB); + if (!t) + return log_oom(); + + if (string_is_glob(t)) + r = strv_push(&globs, t); + else + r = strv_push(&mangled, t); + if (r < 0) { + free(t); + return log_oom(); + } + } + + /* Query the manager only if any of the names are a glob, since + * this is fairly expensive */ + if (!strv_isempty(globs)) { + _cleanup_free_ UnitInfo *unit_infos = NULL; + + r = get_unit_list(bus, &reply, &unit_infos, globs); + if (r < 0) + return r; + + for (i = 0; i < r; i++) + if (strv_extend(&mangled, unit_infos[i].id) < 0) + return log_oom(); + } + + *ret = mangled; + mangled = NULL; /* do not free */ + return 0; +} + static const struct { const char *target; const char *verb; @@ -2077,11 +2219,11 @@ static enum action verb_to_action(const char *verb) { } static int start_unit(sd_bus *bus, char **args) { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_set_free_free_ Set *s = NULL; + _cleanup_strv_free_ char **names = NULL; const char *method, *mode, *one_name; char **name; - int r; + int r = 0; assert(bus); @@ -2089,21 +2231,7 @@ static int start_unit(sd_bus *bus, char **args) { if (arg_action == ACTION_SYSTEMCTL) { enum action action; - method = - streq(args[0], "stop") || - streq(args[0], "condstop") ? "StopUnit" : - streq(args[0], "reload") ? "ReloadUnit" : - streq(args[0], "restart") ? "RestartUnit" : - - streq(args[0], "try-restart") || - streq(args[0], "condrestart") ? "TryRestartUnit" : - - streq(args[0], "reload-or-restart") ? "ReloadOrRestartUnit" : - - streq(args[0], "reload-or-try-restart") || - streq(args[0], "condreload") || - streq(args[0], "force-reload") ? "ReloadOrTryRestartUnit" : - "StartUnit"; + method = verb_to_method(args[0]); action = verb_to_action(args[0]); mode = streq(args[0], "isolate") ? "isolate" : @@ -2120,6 +2248,14 @@ static int start_unit(sd_bus *bus, char **args) { one_name = action_table[arg_action].target; } + if (one_name) + names = strv_new(one_name, NULL); + else { + r = expand_names(bus, args + 1, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); + } + if (!arg_no_block) { r = enable_wait_for_jobs(bus); if (r < 0) { @@ -2132,22 +2268,13 @@ static int start_unit(sd_bus *bus, char **args) { return log_oom(); } - if (one_name) { - r = start_unit_one(bus, method, one_name, mode, &error, s); - if (r < 0) - r = translate_bus_error_to_exit_status(r, &error); - } else { - r = 0; - - STRV_FOREACH(name, args+1) { - int q; + STRV_FOREACH(name, names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + int q; - q = start_unit_one(bus, method, *name, mode, &error, s); - if (q < 0) { - r = translate_bus_error_to_exit_status(r, &error); - sd_bus_error_free(&error); - } - } + q = start_unit_one(bus, method, *name, mode, &error, s); + if (r >= 0 && q < 0) + r = translate_bus_error_to_exit_status(q, &error); } if (!arg_no_block) { @@ -2159,13 +2286,9 @@ static int start_unit(sd_bus *bus, char **args) { /* When stopping units, warn if they can still be triggered by * another active unit (socket, path, timer) */ - if (!arg_quiet && streq(method, "StopUnit")) { - if (one_name) - check_triggering_units(bus, one_name); - else - STRV_FOREACH(name, args+1) - check_triggering_units(bus, *name); - } + if (!arg_quiet && streq(method, "StopUnit")) + STRV_FOREACH(name, names) + check_triggering_units(bus, *name); } return r; @@ -2388,17 +2511,22 @@ static int start_special(sd_bus *bus, char **args) { return r; } -static int check_unit_active(sd_bus *bus, char **args) { +static int check_unit_generic(sd_bus *bus, int code, const char *good_states, char **args) { + _cleanup_strv_free_ char **names = NULL; char **name; - int r = 3; /* According to LSB: "program is not running" */ + int r = code; assert(bus); assert(args); - STRV_FOREACH(name, args+1) { + r = expand_names(bus, args, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); + + STRV_FOREACH(name, names) { int state; - state = check_one_unit(bus, *name, "active\0reloading\0", arg_quiet); + state = check_one_unit(bus, *name, good_states, arg_quiet); if (state < 0) return state; if (state > 0) @@ -2408,30 +2536,20 @@ static int check_unit_active(sd_bus *bus, char **args) { return r; } -static int check_unit_failed(sd_bus *bus, char **args) { - char **name; - int r = 1; - - assert(bus); - assert(args); - - STRV_FOREACH(name, args+1) { - int state; - - state = check_one_unit(bus, *name, "failed\0", arg_quiet); - if (state < 0) - return state; - if (state > 0) - r = 0; - } +static int check_unit_active(sd_bus *bus, char **args) { + /* According to LSB: 3, "program is not running" */ + return check_unit_generic(bus, 3, "active\0reloading\0", args + 1); +} - return r; +static int check_unit_failed(sd_bus *bus, char **args) { + return check_unit_generic(bus, 1, "failed\0", args + 1); } static int kill_unit(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_strv_free_ char **names = NULL; char **name; - int r = 0; + int r, q; assert(bus); assert(args); @@ -2439,14 +2557,12 @@ static int kill_unit(sd_bus *bus, char **args) { if (!arg_kill_who) arg_kill_who = "all"; - STRV_FOREACH(name, args+1) { - _cleanup_free_ char *n = NULL; - - n = unit_name_mangle(*name); - if (!n) - return log_oom(); + r = expand_names(bus, args + 1, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); - r = sd_bus_call_method( + STRV_FOREACH(name, names) { + q = sd_bus_call_method( bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -2454,14 +2570,16 @@ static int kill_unit(sd_bus *bus, char **args) { "KillUnit", &error, NULL, - "ssi", n, arg_kill_who, arg_signal); - if (r < 0) { - log_error("Failed to kill unit %s: %s", n, bus_error_message(&error, r)); - return r; + "ssi", *names, arg_kill_who, arg_signal); + if (q < 0) { + log_error("Failed to kill unit %s: %s", + *names, bus_error_message(&error, r)); + if (r == 0) + r = q; } } - return 0; + return r; } typedef struct ExecStatusInfo { @@ -2687,7 +2805,7 @@ static void print_status_info( last = ! (*(dropin + 1) && startswith(*(dropin + 1), dir)); - printf("%s%s", path_get_file_name(*dropin), last ? "\n" : ", "); + printf("%s%s", basename(*dropin), last ? "\n" : ", "); } } @@ -3507,6 +3625,8 @@ static int show_one( assert(path); assert(new_line); + log_debug("Showing one %s", path); + r = sd_bus_call_method( bus, "org.freedesktop.systemd1", @@ -3611,6 +3731,7 @@ static int get_unit_dbus_path_by_pid( _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + char *u; int r; r = sd_bus_call_method( @@ -3627,10 +3748,15 @@ static int get_unit_dbus_path_by_pid( return r; } - r = sd_bus_message_read(reply, "o", unit); + r = sd_bus_message_read(reply, "o", &u); if (r < 0) return bus_log_parse_error(r); + u = strdup(u); + if (!u) + return log_oom(); + + *unit = u; return 0; } @@ -3647,7 +3773,7 @@ static int show_all( unsigned c; int r; - r = get_unit_list(bus, &reply, &unit_infos); + r = get_unit_list(bus, &reply, &unit_infos, NULL); if (r < 0) return r; @@ -3660,9 +3786,6 @@ static int show_all( for (u = unit_infos; u < unit_infos + c; u++) { _cleanup_free_ char *p = NULL; - if (!output_show_unit(u)) - continue; - p = unit_dbus_path_from_name(u->id); if (!p) return log_oom(); @@ -3676,34 +3799,34 @@ static int show_all( } static int cat(sd_bus *bus, char **args) { - int r = 0; + _cleanup_free_ char *unit = NULL; + _cleanup_strv_free_ char **names = NULL; char **name; - - _cleanup_free_ char *unit = NULL, *n = NULL; + bool first = true; + int r = 0; assert(bus); assert(args); + r = expand_names(bus, args + 1, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); + pager_open_if_enabled(); - STRV_FOREACH(name, args+1) { - _cleanup_free_ char *fragment_path = NULL; + STRV_FOREACH(name, names) { + _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_strv_free_ char **dropin_paths = NULL; - sd_bus_error error; - FILE *stdout; + _cleanup_free_ char *fragment_path = NULL; char **path; - n = unit_name_mangle(*name); - if (!n) - return log_oom(); - - unit = unit_dbus_path_from_name(n); + unit = unit_dbus_path_from_name(*name); if (!unit) return log_oom(); - if (need_daemon_reload(bus, n) > 0) + if (need_daemon_reload(bus, *name) > 0) log_warning("Unit file of %s changed on disk. Run 'systemctl%s daemon-reload'.", - n, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); + *name, arg_scope == UNIT_FILE_SYSTEM ? "" : " --user"); r = sd_bus_get_property_string( bus, @@ -3731,11 +3854,18 @@ static int cat(sd_bus *bus, char **args) { continue; } - stdout = fdopen(STDOUT_FILENO, "a"); + if (first) + first = false; + else + puts(""); if (!isempty(fragment_path)) { - fprintf(stdout, "# %s\n", fragment_path); + printf("%s# %s%s\n", + ansi_highlight_blue(), + fragment_path, + ansi_highlight_off()); fflush(stdout); + r = sendfile_full(STDOUT_FILENO, fragment_path); if (r < 0) { log_warning("Failed to cat %s: %s", fragment_path, strerror(-r)); @@ -3744,10 +3874,13 @@ static int cat(sd_bus *bus, char **args) { } STRV_FOREACH(path, dropin_paths) { - fprintf(stdout, "%s# %s\n", - isempty(fragment_path) && path == dropin_paths ? "" : "\n", - *path); + printf("%s%s# %s%s\n", + isempty(fragment_path) && path == dropin_paths ? "" : "\n", + ansi_highlight_blue(), + *path, + ansi_highlight_off()); fflush(stdout); + r = sendfile_full(STDOUT_FILENO, *path); if (r < 0) { log_warning("Failed to cat %s: %s", *path, strerror(-r)); @@ -3756,14 +3889,13 @@ static int cat(sd_bus *bus, char **args) { } } - return r; + return r < 0 ? r : 0; } static int show(sd_bus *bus, char **args) { - int r, ret = 0; bool show_properties, show_status, new_line = false; - char **name; bool ellipsized = false; + int r, ret = 0; assert(bus); assert(args); @@ -3781,23 +3913,19 @@ static int show(sd_bus *bus, char **args) { if (show_status && strv_length(args) <= 1) ret = show_all(args[0], bus, false, &new_line, &ellipsized); - else - STRV_FOREACH(name, args+1) { + else { + _cleanup_free_ char **patterns = NULL; + char **name; + + STRV_FOREACH(name, args + 1) { _cleanup_free_ char *unit = NULL; uint32_t id; if (safe_atou32(*name, &id) < 0) { - _cleanup_free_ char *n = NULL; - /* Interpret as unit name */ - - n = unit_name_mangle(*name); - if (!n) - return log_oom(); - - unit = unit_dbus_path_from_name(n); - if (!unit) + if (strv_push(&patterns, *name) < 0) return log_oom(); + continue; } else if (show_properties) { /* Interpret as job id */ if (asprintf(&unit, "/org/freedesktop/systemd1/job/%u", id) < 0) @@ -3806,13 +3934,34 @@ static int show(sd_bus *bus, char **args) { } else { /* Interpret as PID */ r = get_unit_dbus_path_by_pid(bus, id, &unit); - if (r < 0) + if (r < 0) { ret = r; + continue; + } } show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized); } + if (!strv_isempty(patterns)) { + _cleanup_strv_free_ char **names = NULL; + + r = expand_names(bus, patterns, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); + + STRV_FOREACH(name, names) { + _cleanup_free_ char *unit; + + unit = unit_dbus_path_from_name(*name); + if (!unit) + return log_oom(); + + show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized); + } + } + } + if (ellipsized && !arg_quiet) printf("Hint: Some lines were ellipsized, use -l to show in full.\n"); @@ -3993,7 +4142,7 @@ static int set_property(sd_bus *bus, char **args) { if (r < 0) return bus_log_create_error(r); - n = unit_name_mangle(args[1]); + n = unit_name_mangle(args[1], MANGLE_NOGLOB); if (!n) return log_oom(); @@ -4040,7 +4189,7 @@ static int snapshot(sd_bus *bus, char **args) { int r; if (strv_length(args) > 1) - n = unit_name_mangle_with_suffix(args[1], ".snapshot"); + n = unit_name_mangle_with_suffix(args[1], MANGLE_NOGLOB, ".snapshot"); else n = strdup(""); if (!n) @@ -4085,19 +4234,18 @@ static int snapshot(sd_bus *bus, char **args) { static int delete_snapshot(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_strv_free_ char **names = NULL; char **name; - int r; + int r, q; assert(args); - STRV_FOREACH(name, args+1) { - _cleanup_free_ char *n = NULL; - - n = unit_name_mangle_with_suffix(*name, ".snapshot"); - if (!n) - return log_oom(); + r = expand_names(bus, args + 1, ".snapshot", &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); - r = sd_bus_call_method( + STRV_FOREACH(name, names) { + q = sd_bus_call_method( bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -4105,14 +4253,16 @@ static int delete_snapshot(sd_bus *bus, char **args) { "RemoveSnapshot", &error, NULL, - "s", n); - if (r < 0) { - log_error("Failed to remove snapshot %s: %s", n, bus_error_message(&error, r)); - return r; + "s", *name); + if (q < 0) { + log_error("Failed to remove snapshot %s: %s", + *name, bus_error_message(&error, r)); + if (r == 0) + r = q; } } - return 0; + return r; } static int daemon_reload(sd_bus *bus, char **args) { @@ -4166,20 +4316,19 @@ static int daemon_reload(sd_bus *bus, char **args) { static int reset_failed(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; + _cleanup_strv_free_ char **names = NULL; char **name; - int r; + int r, q; if (strv_length(args) <= 1) return daemon_reload(bus, args); - STRV_FOREACH(name, args+1) { - _cleanup_free_ char *n; - - n = unit_name_mangle(*name); - if (!n) - return log_oom(); + r = expand_names(bus, args + 1, NULL, &names); + if (r < 0) + log_error("Failed to expand names: %s", strerror(-r)); - r = sd_bus_call_method( + STRV_FOREACH(name, names) { + q = sd_bus_call_method( bus, "org.freedesktop.systemd1", "/org/freedesktop/systemd1", @@ -4187,14 +4336,16 @@ static int reset_failed(sd_bus *bus, char **args) { "ResetFailedUnit", &error, NULL, - "s", n); - if (r < 0) { - log_error("Failed to reset failed state of unit %s: %s", n, bus_error_message(&error, r)); - return r; + "s", *name); + if (q < 0) { + log_error("Failed to reset failed state of unit %s: %s", + *name, bus_error_message(&error, r)); + if (r == 0) + r = q; } } - return 0; + return r; } static int show_environment(sd_bus *bus, char **args) { @@ -4406,7 +4557,7 @@ static int enable_sysv_units(const char *verb, char **args) { if (!isempty(arg_root)) argv[c++] = q = strappend("--root=", arg_root); - argv[c++] = path_get_file_name(p); + argv[c++] = basename(p); argv[c++] = streq(verb, "enable") ? "on" : streq(verb, "disable") ? "off" : "--level=5"; @@ -4493,7 +4644,7 @@ static int mangle_names(char **original_names, char ***mangled_names) { if (is_path(*name)) *i = strdup(*name); else - *i = unit_name_mangle(*name); + *i = unit_name_mangle(*name, MANGLE_NOGLOB); if (!*i) { strv_free(l); @@ -4510,7 +4661,7 @@ static int mangle_names(char **original_names, char ***mangled_names) { } static int enable_unit(sd_bus *bus, char **args) { - _cleanup_strv_free_ char **mangled_names = NULL; + _cleanup_strv_free_ char **names = NULL; const char *verb = args[0]; UnitFileChange *changes = NULL; unsigned n_changes = 0; @@ -4520,32 +4671,32 @@ static int enable_unit(sd_bus *bus, char **args) { if (!args[1]) return 0; - r = mangle_names(args+1, &mangled_names); + r = mangle_names(args+1, &names); if (r < 0) return r; - r = enable_sysv_units(verb, mangled_names); + r = enable_sysv_units(verb, names); if (r < 0) return r; if (!bus || avoid_bus()) { if (streq(verb, "enable")) { - r = unit_file_enable(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes); + r = unit_file_enable(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); carries_install_info = r; } else if (streq(verb, "disable")) - r = unit_file_disable(arg_scope, arg_runtime, arg_root, mangled_names, &changes, &n_changes); + r = unit_file_disable(arg_scope, arg_runtime, arg_root, names, &changes, &n_changes); else if (streq(verb, "reenable")) { - r = unit_file_reenable(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes); + r = unit_file_reenable(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); carries_install_info = r; } else if (streq(verb, "link")) - r = unit_file_link(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes); + r = unit_file_link(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); else if (streq(verb, "preset")) { - r = unit_file_preset(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes); + r = unit_file_preset(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); carries_install_info = r; } else if (streq(verb, "mask")) - r = unit_file_mask(arg_scope, arg_runtime, arg_root, mangled_names, arg_force, &changes, &n_changes); + r = unit_file_mask(arg_scope, arg_runtime, arg_root, names, arg_force, &changes, &n_changes); else if (streq(verb, "unmask")) - r = unit_file_unmask(arg_scope, arg_runtime, arg_root, mangled_names, &changes, &n_changes); + r = unit_file_unmask(arg_scope, arg_runtime, arg_root, names, &changes, &n_changes); else assert_not_reached("Unknown verb"); @@ -4597,7 +4748,7 @@ static int enable_unit(sd_bus *bus, char **args) { if (r < 0) return bus_log_create_error(r); - r = sd_bus_message_append_strv(m, mangled_names); + r = sd_bus_message_append_strv(m, names); if (r < 0) return bus_log_create_error(r); @@ -4654,16 +4805,16 @@ finish: static int unit_is_enabled(sd_bus *bus, char **args) { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - _cleanup_strv_free_ char **mangled_names = NULL; + _cleanup_strv_free_ char **names = NULL; bool enabled; char **name; int r; - r = mangle_names(args+1, &mangled_names); + r = mangle_names(args+1, &names); if (r < 0) return r; - r = enable_sysv_units(args[0], mangled_names); + r = enable_sysv_units(args[0], names); if (r < 0) return r; @@ -4671,7 +4822,7 @@ static int unit_is_enabled(sd_bus *bus, char **args) { if (!bus || avoid_bus()) { - STRV_FOREACH(name, mangled_names) { + STRV_FOREACH(name, names) { UnitFileState state; state = unit_file_get_state(arg_scope, arg_root, *name); @@ -4690,7 +4841,7 @@ static int unit_is_enabled(sd_bus *bus, char **args) { } } else { - STRV_FOREACH(name, mangled_names) { + STRV_FOREACH(name, names) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; const char *s; @@ -4702,7 +4853,7 @@ static int unit_is_enabled(sd_bus *bus, char **args) { "GetUnitFileState", &error, &reply, - "s", name); + "s", *name); if (r < 0) { log_error("Failed to get unit file state for %s: %s", *name, bus_error_message(&error, r)); return r; @@ -4770,60 +4921,60 @@ static int systemctl_help(void) { " --root=PATH Enable unit files in the specified root directory\n" " -n --lines=INTEGER Number of journal entries to show\n" " -o --output=STRING Change journal output mode (short, short-monotonic,\n" - " verbose, export, json, json-pretty, json-sse, cat)\n\n" + " verbose, export, json, json-pretty, json-sse, cat)\n" + " --plain Print unit dependencies as a list instead of a tree\n\n" "Unit Commands:\n" - " list-units List loaded units\n" - " list-sockets List loaded sockets ordered by address\n" - " list-timers List loaded timers ordered by next elapse\n" - " start [NAME...] Start (activate) one or more units\n" - " stop [NAME...] Stop (deactivate) one or more units\n" - " reload [NAME...] Reload one or more units\n" - " restart [NAME...] Start or restart one or more units\n" - " try-restart [NAME...] Restart one or more units if active\n" - " reload-or-restart [NAME...] Reload one or more units if possible,\n" + " list-units [PATTERN...] List loaded units\n" + " list-sockets [PATTERN...] List loaded sockets ordered by address\n" + " list-timers [PATTERN...] List loaded timers ordered by next elapse\n" + " start NAME... Start (activate) one or more units\n" + " stop NAME... Stop (deactivate) one or more units\n" + " reload NAME... Reload one or more units\n" + " restart NAME... Start or restart one or more units\n" + " try-restart NAME... Restart one or more units if active\n" + " reload-or-restart NAME... Reload one or more units if possible,\n" " otherwise start or restart\n" - " reload-or-try-restart [NAME...] Reload one or more units if possible,\n" + " reload-or-try-restart NAME... Reload one or more units if possible,\n" " otherwise restart if active\n" - " isolate [NAME] Start one unit and stop all others\n" - " kill [NAME...] Send signal to processes of a unit\n" - " is-active [NAME...] Check whether units are active\n" - " is-failed [NAME...] Check whether units are failed\n" + " isolate NAME Start one unit and stop all others\n" + " kill NAME... Send signal to processes of a unit\n" + " is-active NAME... Check whether units are active\n" + " is-failed NAME... Check whether units are failed\n" " status [NAME...|PID...] Show runtime status of one or more units\n" " show [NAME...|JOB...] Show properties of one or more\n" " units/jobs or the manager\n" - " cat [NAME...] Show files and drop-ins of one or more units\n" - " set-property [NAME] [ASSIGNMENT...]\n" - " Sets one or more properties of a unit\n" - " help [NAME...|PID...] Show manual for one or more units\n" + " cat NAME... Show files and drop-ins of one or more units\n" + " set-property NAME ASSIGNMENT... Sets one or more properties of a unit\n" + " help NAME...|PID... Show manual for one or more units\n" " reset-failed [NAME...] Reset failed state for all, one, or more\n" " units\n" " list-dependencies [NAME] Recursively show units which are required\n" " or wanted by this unit or by which this\n" " unit is required or wanted\n\n" "Unit File Commands:\n" - " list-unit-files List installed unit files\n" - " enable [NAME...] Enable one or more unit files\n" - " disable [NAME...] Disable one or more unit files\n" - " reenable [NAME...] Reenable one or more unit files\n" - " preset [NAME...] Enable/disable one or more unit files\n" + " list-unit-files [PATTERN...] List installed unit files\n" + " enable NAME... Enable one or more unit files\n" + " disable NAME... Disable one or more unit files\n" + " reenable NAME... Reenable one or more unit files\n" + " preset NAME... Enable/disable one or more unit files\n" " based on preset configuration\n" - " is-enabled [NAME...] Check whether unit files are enabled\n\n" - " mask [NAME...] Mask one or more units\n" - " unmask [NAME...] Unmask one or more units\n" - " link [PATH...] Link one or more units files into\n" + " is-enabled NAME... Check whether unit files are enabled\n\n" + " mask NAME... Mask one or more units\n" + " unmask NAME... Unmask one or more units\n" + " link PATH... Link one or more units files into\n" " the search path\n" " get-default Get the name of the default target\n" " set-default NAME Set the default target\n\n" "Job Commands:\n" - " list-jobs List jobs\n" + " list-jobs [PATTERN...] List jobs\n" " cancel [JOB...] Cancel all, one, or more jobs\n\n" "Snapshot Commands:\n" " snapshot [NAME] Create a snapshot\n" - " delete [NAME...] Remove one or more snapshots\n\n" + " delete NAME... Remove one or more snapshots\n\n" "Environment Commands:\n" " show-environment Dump environment\n" - " set-environment [NAME=VALUE...] Set one or more environment variables\n" - " unset-environment [NAME...] Unset one or more environment variables\n\n" + " set-environment NAME=VALUE... Set one or more environment variables\n" + " unset-environment NAME... Unset one or more environment variables\n\n" "Manager Lifecycle Commands:\n" " daemon-reload Reload systemd manager configuration\n" " daemon-reexec Reexecute systemd manager\n\n" @@ -4836,7 +4987,7 @@ static int systemctl_help(void) { " reboot [ARG] Shut down and reboot the system\n" " kexec Shut down and reboot the system with kexec\n" " exit Request user instance exit\n" - " switch-root [ROOT] [INIT] Change to a different root file system\n" + " switch-root ROOT [INIT] Change to a different root file system\n" " suspend Suspend the system\n" " hibernate Hibernate the system\n" " hybrid-sleep Hibernate and suspend the system\n", @@ -5750,12 +5901,16 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { } argc_cmp; const int argc; int (* const dispatch)(sd_bus *bus, char **args); + const enum { + NOBUS = 1, + FORCE, + } bus; } verbs[] = { - { "list-units", LESS, 1, list_units }, - { "list-unit-files", EQUAL, 1, list_unit_files }, - { "list-sockets", LESS, 1, list_sockets }, - { "list-timers", LESS, 1, list_timers }, - { "list-jobs", EQUAL, 1, list_jobs }, + { "list-units", MORE, 0, list_units }, + { "list-unit-files", MORE, 1, list_unit_files, NOBUS }, + { "list-sockets", MORE, 1, list_sockets }, + { "list-timers", MORE, 1, list_timers }, + { "list-jobs", MORE, 1, list_jobs }, { "clear-jobs", EQUAL, 1, daemon_reload }, { "cancel", MORE, 2, cancel_job }, { "start", MORE, 2, start_unit }, @@ -5785,9 +5940,9 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { { "show-environment", EQUAL, 1, show_environment }, { "set-environment", MORE, 2, set_environment }, { "unset-environment", MORE, 2, set_environment }, - { "halt", EQUAL, 1, start_special }, - { "poweroff", EQUAL, 1, start_special }, - { "reboot", EQUAL, 1, start_special }, + { "halt", EQUAL, 1, start_special, FORCE }, + { "poweroff", EQUAL, 1, start_special, FORCE }, + { "reboot", EQUAL, 1, start_special, FORCE }, { "kexec", EQUAL, 1, start_special }, { "suspend", EQUAL, 1, start_special }, { "hibernate", EQUAL, 1, start_special }, @@ -5797,53 +5952,50 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { { "emergency", EQUAL, 1, start_special }, { "exit", EQUAL, 1, start_special }, { "reset-failed", MORE, 1, reset_failed }, - { "enable", MORE, 2, enable_unit }, - { "disable", MORE, 2, enable_unit }, - { "is-enabled", MORE, 2, unit_is_enabled }, - { "reenable", MORE, 2, enable_unit }, - { "preset", MORE, 2, enable_unit }, - { "mask", MORE, 2, enable_unit }, - { "unmask", MORE, 2, enable_unit }, - { "link", MORE, 2, enable_unit }, + { "enable", MORE, 2, enable_unit, NOBUS }, + { "disable", MORE, 2, enable_unit, NOBUS }, + { "is-enabled", MORE, 2, unit_is_enabled, NOBUS }, + { "reenable", MORE, 2, enable_unit, NOBUS }, + { "preset", MORE, 2, enable_unit, NOBUS }, + { "mask", MORE, 2, enable_unit, NOBUS }, + { "unmask", MORE, 2, enable_unit, NOBUS }, + { "link", MORE, 2, enable_unit, NOBUS }, { "switch-root", MORE, 2, switch_root }, { "list-dependencies", LESS, 2, list_dependencies }, - { "set-default", EQUAL, 2, set_default }, - { "get-default", EQUAL, 1, get_default }, + { "set-default", EQUAL, 2, set_default, NOBUS }, + { "get-default", EQUAL, 1, get_default, NOBUS }, { "set-property", MORE, 3, set_property }, - }; + {} + }, *verb = verbs; int left; - unsigned i; assert(argc >= 0); assert(argv); left = argc - optind; - if (left <= 0) - /* Special rule: no arguments means "list-units" */ - i = 0; - else { + /* Special rule: no arguments (left == 0) means "list-units" */ + if (left > 0) { if (streq(argv[optind], "help") && !argv[optind+1]) { log_error("This command expects one or more " "unit names. Did you mean --help?"); return -EINVAL; } - for (i = 0; i < ELEMENTSOF(verbs); i++) - if (streq(argv[optind], verbs[i].verb)) - break; + for (; verb->verb; verb++) + if (streq(argv[optind], verb->verb)) + goto found; - if (i >= ELEMENTSOF(verbs)) { - log_error("Unknown operation '%s'.", argv[optind]); - return -EINVAL; - } + log_error("Unknown operation '%s'.", argv[optind]); + return -EINVAL; } +found: - switch (verbs[i].argc_cmp) { + switch (verb->argc_cmp) { case EQUAL: - if (left != verbs[i].argc) { + if (left != verb->argc) { log_error("Invalid number of arguments."); return -EINVAL; } @@ -5851,7 +6003,7 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { break; case MORE: - if (left < verbs[i].argc) { + if (left < verb->argc) { log_error("Too few arguments."); return -EINVAL; } @@ -5859,7 +6011,7 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { break; case LESS: - if (left > verbs[i].argc) { + if (left > verb->argc) { log_error("Too many arguments."); return -EINVAL; } @@ -5872,39 +6024,25 @@ static int systemctl_main(sd_bus *bus, int argc, char *argv[], int bus_error) { /* Require a bus connection for all operations but * enable/disable */ - if (!streq(verbs[i].verb, "enable") && - !streq(verbs[i].verb, "disable") && - !streq(verbs[i].verb, "is-enabled") && - !streq(verbs[i].verb, "list-unit-files") && - !streq(verbs[i].verb, "reenable") && - !streq(verbs[i].verb, "preset") && - !streq(verbs[i].verb, "mask") && - !streq(verbs[i].verb, "unmask") && - !streq(verbs[i].verb, "link") && - !streq(verbs[i].verb, "set-default") && - !streq(verbs[i].verb, "get-default")) { + if (verb->bus == NOBUS) { + if (!bus && !avoid_bus()) { + log_error("Failed to get D-Bus connection: %s", strerror(-bus_error)); + return -EIO; + } + } else { if (running_in_chroot() > 0) { log_info("Running in chroot, ignoring request."); return 0; } - if (((!streq(verbs[i].verb, "reboot") && - !streq(verbs[i].verb, "halt") && - !streq(verbs[i].verb, "poweroff")) || arg_force <= 0) && !bus) { - log_error("Failed to get D-Bus connection: %s", strerror (-bus_error)); - return -EIO; - } - - } else { - - if (!bus && !avoid_bus()) { - log_error("Failed to get D-Bus connection: %s", strerror (-bus_error)); + if ((verb->bus != FORCE || arg_force <= 0) && !bus) { + log_error("Failed to get D-Bus connection: %s", strerror(-bus_error)); return -EIO; } } - return verbs[i].dispatch(bus, argv + optind); + return verb->dispatch(bus, argv + optind); } static int send_shutdownd(usec_t t, char mode, bool dry_run, bool warn, const char *message) {