From: Zbigniew Jędrzejewski-Szmek Date: Fri, 27 Jun 2025 12:06:32 +0000 (+0200) Subject: shared/bus-unit-util: define helper for StandardInputData= X-Git-Tag: v258-rc1~183^2~36 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c41755fe6ddc0a1bc9f6f2816910dd2748a5501;p=thirdparty%2Fsystemd.git shared/bus-unit-util: define helper for StandardInputData= --- diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index 2a49d5717df..59b5fe93530 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -1254,6 +1254,18 @@ static int bus_append_standard_input_text(sd_bus_message *m, const char *field, return bus_append_byte_array(m, field, unescaped, l + 1); } +static int bus_append_standard_input_data(sd_bus_message *m, const char *field, const char *eq) { + _cleanup_free_ void *decoded = NULL; + size_t sz; + int r; + + r = unbase64mem(eq, &decoded, &sz); + if (r < 0) + return log_error_errno(r, "Failed to decode base64 data '%s': %m", eq); + + return bus_append_byte_array(m, field, decoded, sz); +} + static int bus_append_cgroup_property(sd_bus_message *m, const char *field, const char *eq) { if (STR_IN_SET(field, "DevicePolicy", "Slice", @@ -1547,16 +1559,8 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con if (streq(field, "StandardInputText")) return bus_append_standard_input_text(m, field, eq); - if (streq(field, "StandardInputData")) { - _cleanup_free_ void *decoded = NULL; - size_t sz; - - r = unbase64mem(eq, &decoded, &sz); - if (r < 0) - return log_error_errno(r, "Failed to decode base64 data '%s': %m", eq); - - return bus_append_byte_array(m, field, decoded, sz); - } + if (streq(field, "StandardInputData")) + return bus_append_standard_input_data(m, field, eq); if ((suffix = startswith(field, "Limit"))) { int rl;