X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Frun%2Frun.c;h=b9be1455c42dcc8c8cd38cbcdd1c0581a05fe1a3;hb=af93291cc4cbd2fe2fb4af7d3c56138fb39f31dc;hp=e3b040d79a6d587279f7c9e4ef4991e600e1bbad;hpb=7040b626e82d65dc48a4e464965e15ec7f529aec;p=elogind.git diff --git a/src/run/run.c b/src/run/run.c index e3b040d79..b9be1455c 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -335,11 +335,11 @@ static int start_transient_service( _cleanup_free_ char *name = NULL; int r; - if (arg_unit) + if (arg_unit) { 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); @@ -471,11 +471,11 @@ static int start_transient_scope( assert(bus); - if (arg_unit) + if (arg_unit) { 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); @@ -593,7 +593,7 @@ int main(int argc, char* argv[]) { 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) { log_error("Failed to create bus connection: %s", strerror(-r)); goto finish;