X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdbus-execute.c;h=12523999d48efc2385ddfd1aec3beb042f84297c;hp=ca7ee5c10be4e1aba33012cca9c5a7cfb6b5e637;hb=76cd584b8d6e0df5f662f193803ce2bdc530ac86;hpb=718db96199eb307751264e4163555662c9a389fa diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index ca7ee5c10..12523999d 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -40,8 +40,8 @@ static int property_get_environment_files( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; char **j; @@ -72,8 +72,8 @@ static int property_get_rlimit( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { struct rlimit *rl; uint64_t u; @@ -106,8 +106,8 @@ static int property_get_oom_score_adjust( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -136,8 +136,8 @@ static int property_get_nice( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -165,8 +165,8 @@ static int property_get_ioprio( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -193,8 +193,8 @@ static int property_get_cpu_sched_policy( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; int32_t n; @@ -220,8 +220,8 @@ static int property_get_cpu_sched_priority( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; int32_t n; @@ -250,8 +250,8 @@ static int property_get_cpu_affinity( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -271,8 +271,8 @@ static int property_get_timer_slack_nsec( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; uint64_t u; @@ -295,8 +295,8 @@ static int property_get_capability_bounding_set( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -315,8 +315,8 @@ static int property_get_capabilities( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; char *t = NULL; @@ -349,8 +349,8 @@ static int property_get_syscall_filter( const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *error) { ExecContext *c = userdata; @@ -428,16 +428,52 @@ const sd_bus_vtable bus_exec_vtable[] = { SD_BUS_VTABLE_END }; +static int append_exec_command(sd_bus_message *reply, ExecCommand *c) { + int r; + + assert(reply); + assert(c); + + if (!c->path) + return 0; + + r = sd_bus_message_open_container(reply, 'r', "sasbttttuii"); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "s", c->path); + if (r < 0) + return r; + + r = sd_bus_message_append_strv(reply, c->argv); + if (r < 0) + return r; + + r = sd_bus_message_append(reply, "bttttuii", + c->ignore, + c->exec_status.start_timestamp.realtime, + c->exec_status.start_timestamp.monotonic, + c->exec_status.exit_timestamp.realtime, + c->exec_status.exit_timestamp.monotonic, + (uint32_t) c->exec_status.pid, + (int32_t) c->exec_status.code, + (int32_t) c->exec_status.status); + if (r < 0) + return r; + + return sd_bus_message_close_container(reply); +} + int bus_property_get_exec_command( sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, - sd_bus_error *error, - void *userdata) { + void *userdata, + sd_bus_error *ret_error) { - ExecCommand *c = *(ExecCommand**) userdata; + ExecCommand *c = (ExecCommand*) userdata; int r; assert(bus); @@ -447,35 +483,34 @@ int bus_property_get_exec_command( if (r < 0) return r; - LIST_FOREACH(command, c, c) { - if (!c->path) - continue; + r = append_exec_command(reply, c); + if (r < 0) + return r; - r = sd_bus_message_open_container(reply, 'r', "sasbttttuii"); - if (r < 0) - return r; + return sd_bus_message_close_container(reply); +} - r = sd_bus_message_append(reply, "s", c->path); - if (r < 0) - return r; +int bus_property_get_exec_command_list( + sd_bus *bus, + const char *path, + const char *interface, + const char *property, + sd_bus_message *reply, + void *userdata, + sd_bus_error *ret_error) { - r = sd_bus_message_append_strv(reply, c->argv); - if (r < 0) - return r; + ExecCommand *c = *(ExecCommand**) userdata; + int r; - r = sd_bus_message_append(reply, "bttttuii", - c->ignore, - c->exec_status.start_timestamp.realtime, - c->exec_status.start_timestamp.monotonic, - c->exec_status.exit_timestamp.realtime, - c->exec_status.exit_timestamp.monotonic, - (uint32_t) c->exec_status.pid, - (int32_t) c->exec_status.code, - (int32_t) c->exec_status.status); - if (r < 0) - return r; + assert(bus); + assert(reply); + + r = sd_bus_message_open_container(reply, 'a', "(sasbttttuii)"); + if (r < 0) + return r; - r = sd_bus_message_close_container(reply); + LIST_FOREACH(command, c, c) { + r = append_exec_command(reply, c); if (r < 0) return r; }