shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

systemctl: simplify start_unit

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-12-24 23:55:43 -05:00
parent 91f0ac7d40
commit b652054662
2 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fsck/fsck.c
View File

@ -73,7 +73,8 @@ static void start_target(const char *target) {
}
static int parse_proc_cmdline(void) {
char *line, *w, *state;
_cleanup_free_ char *line = NULL;
char *w, *state;
size_t l;
int r;
@ -104,7 +105,6 @@ static int parse_proc_cmdline(void) {
#endif
}
free(line);
return 0;
}

44
src/systemctl/systemctl.c
View File

@ -2146,9 +2146,10 @@ 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;
const char *method, *mode, *one_name;
const char *method, *mode;
char **name;
int r;
int r = 0;
char **names, *strv[] = {NULL, NULL}; /* at most one name */
assert(bus);
@ -2176,7 +2177,7 @@ static int start_unit(sd_bus *bus, char **args) {
mode = streq(args[0], "isolate") ? "isolate" :
action_table[action].mode ?: arg_job_mode;
one_name = action_table[action].target;
strv[0] = (char*) action_table[action].target;
} else {
assert(arg_action < ELEMENTSOF(action_table));
assert(action_table[arg_action].target);
@ -2184,9 +2185,14 @@ static int start_unit(sd_bus *bus, char **args) {
method = "StartUnit";
mode = action_table[arg_action].mode;
one_name = action_table[arg_action].target;
strv[0] = (char*) action_table[arg_action].target;
}
if (strv[0])
names = strv;
else
names = args + 1;
if (!arg_no_block) {
r = enable_wait_for_jobs(bus);
if (r < 0) {
@ -2199,21 +2205,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, names) {
int q;
STRV_FOREACH(name, args+1) {
int q;
q = start_unit_one(bus, method, *name, mode, &error, s);
if (q < 0) {
r = translate_bus_error_to_exit_status(q, &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);
sd_bus_error_free(&error);
}
}
@ -2226,13 +2224,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;