chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: auto-convert the simple cases to log_*_errno()
[elogind.git]
/
src
/
run
/
run.c
diff --git
a/src/run/run.c
b/src/run/run.c
index e3b040d79a6d587279f7c9e4ef4991e600e1bbad..14d147c671d8bb461cf3dd2d1466c4f60a2830ec 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.");
@@
-335,11
+332,11
@@
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
)
+ 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);
return log_oom();
r = message_start_transient_unit_new(bus, name, &m);
@@
-471,11
+468,11
@@
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
)
+ 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);
return log_oom();
r = message_start_transient_unit_new(bus, name, &m);
@@
-502,7
+499,7
@@
static int start_transient_scope(
r = get_group_creds(&arg_exec_group, &gid);
if (r < 0) {
r = get_group_creds(&arg_exec_group, &gid);
if (r < 0) {
- log_error
("Failed to resolve group %s: %s", arg_exec_group, strerror(-r)
);
+ log_error
_errno(-r, "Failed to resolve group %s: %m", arg_exec_group
);
return r;
}
return r;
}
@@
-519,7
+516,7
@@
static int start_transient_scope(
r = get_user_creds(&arg_exec_user, &uid, &gid, &home, &shell);
if (r < 0) {
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)
);
+ log_error
_errno(-r, "Failed to resolve user %s: %m", arg_exec_user
);
return r;
}
return r;
}
@@
-565,7
+562,7
@@
static int start_transient_scope(
int main(int argc, char* argv[]) {
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
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;
@@
-576,9
+573,12
@@
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("Failed to find executable %s%s: %s",
+ argv[optind],
+ arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system",
+ strerror(-r));
goto finish;
}
argv[optind] = command;
goto finish;
}
argv[optind] = command;
@@
-593,9
+593,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;
}