chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolve: remove unused variable
[elogind.git]
/
src
/
run
/
run.c
diff --git
a/src/run/run.c
b/src/run/run.c
index c6d3aabbdbc040dbff3182b5bf092c4ca11a6b7f..85eb052343a5d73b2d8d2958aa12aa83bb7fc13d 100644
(file)
--- a/
src/run/run.c
+++ b/
src/run/run.c
@@
-48,8
+48,7
@@
static bool arg_nice_set = false;
static char **arg_environment = NULL;
static char **arg_property = NULL;
static char **arg_environment = NULL;
static char **arg_property = NULL;
-static int help(void) {
-
+static void help(void) {
printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n"
"Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n"
"Run the specified command in a transient scope or service unit.\n\n"
" -h --help Show this help\n"
@@
-70,8
+69,6
@@
static int help(void) {
" --nice=NICE Nice level\n"
" --setenv=NAME=VALUE Set environment\n",
program_invocation_short_name);
" --nice=NICE Nice level\n"
" --setenv=NAME=VALUE Set environment\n",
program_invocation_short_name);
-
- return 0;
}
static int parse_argv(int argc, char *argv[]) {
}
static int parse_argv(int argc, char *argv[]) {
@@
-119,12
+116,13
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 0);
assert(argv);
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "+hrH:M:p:", options, NULL)) >= 0)
{
+ while ((c = getopt_long(argc, argv, "+hrH:M:p:", options, NULL)) >= 0)
switch (c) {
case 'h':
switch (c) {
case 'h':
- return help();
+ help();
+ return 0;
case ARG_VERSION:
puts(PACKAGE_STRING);
case ARG_VERSION:
puts(PACKAGE_STRING);
@@
-215,7
+213,6
@@
static int parse_argv(int argc, char *argv[]) {
default:
assert_not_reached("Unhandled option");
}
default:
assert_not_reached("Unhandled option");
}
- }
if (optind >= argc) {
log_error("Command line to execute required.");
if (optind >= argc) {
log_error("Command line to execute required.");
@@
-249,8
+246,6
@@
static int message_start_transient_unit_new(sd_bus *bus, const char *name, sd_bu
assert(name);
assert(ret);
assert(name);
assert(ret);
- log_info("Running as unit %s.", name);
-
r = sd_bus_message_new_method_call(
bus,
&m,
r = sd_bus_message_new_method_call(
bus,
&m,
@@
-337,122
+332,128
@@
static int start_transient_service(
_cleanup_free_ char *name = NULL;
int r;
_cleanup_free_ char *name = NULL;
int r;
- if (arg_unit)
+ if (arg_unit)
{
name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service");
name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".service");
- else
-
asprintf(&name, "run-%lu.service", (unsigned long) getpid()
);
-
if (!name
)
- return
-ENOMEM
;
+ if (!name)
+
return log_oom(
);
+
} else if (asprintf(&name, "run-"PID_FMT".service", getpid()) < 0
)
+ return
log_oom()
;
r = message_start_transient_unit_new(bus, name, &m);
if (r < 0)
r = message_start_transient_unit_new(bus, name, &m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
if (arg_remain_after_exit) {
r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit);
if (r < 0)
if (arg_remain_after_exit) {
r = sd_bus_message_append(m, "(sv)", "RemainAfterExit", "b", arg_remain_after_exit);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
if (arg_service_type) {
r = sd_bus_message_append(m, "(sv)", "Type", "s", arg_service_type);
if (r < 0)
}
if (arg_service_type) {
r = sd_bus_message_append(m, "(sv)", "Type", "s", arg_service_type);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
if (arg_exec_user) {
r = sd_bus_message_append(m, "(sv)", "User", "s", arg_exec_user);
if (r < 0)
}
if (arg_exec_user) {
r = sd_bus_message_append(m, "(sv)", "User", "s", arg_exec_user);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
if (arg_exec_group) {
r = sd_bus_message_append(m, "(sv)", "Group", "s", arg_exec_group);
if (r < 0)
}
if (arg_exec_group) {
r = sd_bus_message_append(m, "(sv)", "Group", "s", arg_exec_group);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
if (arg_nice_set) {
r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice);
if (r < 0)
}
if (arg_nice_set) {
r = sd_bus_message_append(m, "(sv)", "Nice", "i", arg_nice);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
if (!strv_isempty(arg_environment)) {
r = sd_bus_message_open_container(m, 'r', "sv");
if (r < 0)
}
if (!strv_isempty(arg_environment)) {
r = sd_bus_message_open_container(m, 'r', "sv");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append(m, "s", "Environment");
if (r < 0)
r = sd_bus_message_append(m, "s", "Environment");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_open_container(m, 'v', "as");
if (r < 0)
r = sd_bus_message_open_container(m, 'v', "as");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append_strv(m, arg_environment);
if (r < 0)
r = sd_bus_message_append_strv(m, arg_environment);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
}
r = sd_bus_message_open_container(m, 'r', "sv");
if (r < 0)
}
r = sd_bus_message_open_container(m, 'r', "sv");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append(m, "s", "ExecStart");
if (r < 0)
r = sd_bus_message_append(m, "s", "ExecStart");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_open_container(m, 'v', "a(sasb)");
if (r < 0)
r = sd_bus_message_open_container(m, 'v', "a(sasb)");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_open_container(m, 'a', "(sasb)");
if (r < 0)
r = sd_bus_message_open_container(m, 'a', "(sasb)");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_open_container(m, 'r', "sasb");
if (r < 0)
r = sd_bus_message_open_container(m, 'r', "sasb");
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append(m, "s", argv[0]);
if (r < 0)
r = sd_bus_message_append(m, "s", argv[0]);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append_strv(m, argv);
if (r < 0)
r = sd_bus_message_append_strv(m, argv);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append(m, "b", false);
if (r < 0)
r = sd_bus_message_append(m, "b", false);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_close_container(m);
if (r < 0)
r = sd_bus_message_close_container(m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
- return message_start_transient_unit_send(bus, m, error, NULL);
+ r = message_start_transient_unit_send(bus, m, error, NULL);
+ if (r < 0)
+ return bus_log_create_error(r);
+
+ log_info("Running as unit %s.", name);
+
+ return 0;
}
static int start_transient_scope(
}
static int start_transient_scope(
@@
-467,45
+468,39
@@
static int start_transient_scope(
assert(bus);
assert(bus);
- if (arg_unit)
+ if (arg_unit)
{
name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope");
name = unit_name_mangle_with_suffix(arg_unit, MANGLE_NOGLOB, ".scope");
- else
-
asprintf(&name, "run-%lu.scope", (unsigned long) getpid()
);
-
if (!name
)
- return
-ENOMEM
;
+ if (!name)
+
return log_oom(
);
+
} else if (asprintf(&name, "run-"PID_FMT".scope", getpid()) < 0
)
+ return
log_oom()
;
r = message_start_transient_unit_new(bus, name, &m);
if (r < 0)
r = message_start_transient_unit_new(bus, name, &m);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
if (r < 0)
r = sd_bus_message_append(m, "(sv)", "PIDs", "au", 1, (uint32_t) getpid());
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
r = message_start_transient_unit_send(bus, m, error, NULL);
if (r < 0)
r = message_start_transient_unit_send(bus, m, error, NULL);
if (r < 0)
- return
r
;
+ return
bus_log_create_error(r)
;
if (arg_nice_set) {
if (arg_nice_set) {
- if (setpriority(PRIO_PROCESS, 0, arg_nice) < 0) {
- log_error("Failed to set nice level: %m");
- return -errno;
- }
+ if (setpriority(PRIO_PROCESS, 0, arg_nice) < 0)
+ return log_error_errno(errno, "Failed to set nice level: %m");
}
if (arg_exec_group) {
gid_t gid;
r = get_group_creds(&arg_exec_group, &gid);
}
if (arg_exec_group) {
gid_t gid;
r = get_group_creds(&arg_exec_group, &gid);
- if (r < 0) {
- log_error("Failed to resolve group %s: %s", arg_exec_group, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to resolve group %s: %m", arg_exec_group);
- if (setresgid(gid, gid, gid) < 0) {
- log_error("Failed to change GID to " GID_FMT ": %m", gid);
- return -errno;
- }
+ if (setresgid(gid, gid, gid) < 0)
+ return log_error_errno(errno, "Failed to change GID to " GID_FMT ": %m", gid);
}
if (arg_exec_user) {
}
if (arg_exec_user) {
@@
-514,10
+509,8
@@
static int start_transient_scope(
gid_t gid;
r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell);
gid_t gid;
r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell);
- if (r < 0) {
- log_error("Failed to resolve user %s: %s", arg_exec_user, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to resolve user %s: %m", arg_exec_user);
r = strv_extendf(&user_env, "HOME=%s", home);
if (r < 0)
r = strv_extendf(&user_env, "HOME=%s", home);
if (r < 0)
@@
-536,30
+529,28
@@
static int start_transient_scope(
return log_oom();
if (!arg_exec_group) {
return log_oom();
if (!arg_exec_group) {
- if (setresgid(gid, gid, gid) < 0) {
- log_error("Failed to change GID to " GID_FMT ": %m", gid);
- return -errno;
- }
+ if (setresgid(gid, gid, gid) < 0)
+ return log_error_errno(errno, "Failed to change GID to " GID_FMT ": %m", gid);
}
}
- if (setresuid(uid, uid, uid) < 0) {
- log_error("Failed to change UID to " UID_FMT ": %m", uid);
- return -errno;
- }
+ if (setresuid(uid, uid, uid) < 0)
+ return log_error_errno(errno, "Failed to change UID to " UID_FMT ": %m", uid);
}
env = strv_env_merge(3, environ, user_env, arg_environment);
if (!env)
return log_oom();
}
env = strv_env_merge(3, environ, user_env, arg_environment);
if (!env)
return log_oom();
+ log_info("Running as unit %s.", name);
+
execvpe(argv[0], argv, env);
execvpe(argv[0], argv, env);
- log_error
(
"Failed to execute: %m");
+ log_error
_errno(errno,
"Failed to execute: %m");
return -errno;
}
int main(int argc, char* argv[]) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
return -errno;
}
int main(int argc, char* argv[]) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
- _cleanup_bus_unref_ sd_bus *bus = NULL;
+ _cleanup_bus_
close_
unref_ sd_bus *bus = NULL;
_cleanup_free_ char *description = NULL, *command = NULL;
int r;
_cleanup_free_ char *description = NULL, *command = NULL;
int r;
@@
-570,9
+561,11
@@
int main(int argc, char* argv[]) {
if (r <= 0)
goto finish;
if (r <= 0)
goto finish;
- r = find_binary(argv[optind], &command);
+ r = find_binary(argv[optind],
arg_transport == BUS_TRANSPORT_LOCAL,
&command);
if (r < 0) {
if (r < 0) {
- log_error("Failed to find executable %s: %s", argv[optind], strerror(-r));
+ log_error_errno(r, "Failed to find executable %s%s: %m",
+ argv[optind],
+ arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system");
goto finish;
}
argv[optind] = command;
goto finish;
}
argv[optind] = command;
@@
-587,9
+580,9
@@
int main(int argc, char* argv[]) {
arg_description = description;
}
arg_description = description;
}
- r = bus_open_transport(arg_transport, arg_host, arg_user, &bus);
+ r = bus_open_transport
_systemd
(arg_transport, arg_host, arg_user, &bus);
if (r < 0) {
if (r < 0) {
- log_error
("Failed to create bus connection: %s", strerror(-r)
);
+ log_error
_errno(r, "Failed to create bus connection: %m"
);
goto finish;
}
goto finish;
}
@@
-597,8
+590,6
@@
int main(int argc, char* argv[]) {
r = start_transient_scope(bus, argv + optind, &error);
else
r = start_transient_service(bus, argv + optind, &error);
r = start_transient_scope(bus, argv + optind, &error);
else
r = start_transient_service(bus, argv + optind, &error);
- if (r < 0)
- log_error("Failed start transient unit: %s", bus_error_message(&error, r));
finish:
strv_free(arg_environment);
finish:
strv_free(arg_environment);