From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 18 Jun 2025 14:45:49 +0000 (+0200)
Subject: shared/bus-unit-util: define helper function for EnvironmentFile=
X-Git-Tag: v258-rc1~183^2~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c4b4a93d60ab147722c3fa63674213a0734ff37;p=thirdparty%2Fsystemd.git

shared/bus-unit-util: define helper function for EnvironmentFile=
---

diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index a54070d6148..774dbc78d41 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -967,6 +967,21 @@ static int bus_append_nft_set(sd_bus_message *m, const char *field, const char *
         return 1;
 }
 
+static int bus_append_environment_files(sd_bus_message *m, const char *field, const char *eq) {
+        int r;
+
+        if (isempty(eq))
+                r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 0);
+        else
+                r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 1,
+                                          eq[0] == '-' ? eq + 1 : eq,
+                                          eq[0] == '-');
+        if (r < 0)
+                return bus_log_create_error(r);
+
+        return 1;
+}
+
 static int bus_append_cgroup_property(sd_bus_message *m, const char *field, const char *eq) {
         if (STR_IN_SET(field, "DevicePolicy",
                               "Slice",
@@ -1234,18 +1249,9 @@ static int bus_append_execute_property(sd_bus_message *m, const char *field, con
                               "PassEnvironment"))
                 return bus_append_strv(m, field, eq, /* separator= */ NULL, EXTRACT_UNQUOTE|EXTRACT_CUNESCAPE);
 
-        if (streq(field, "EnvironmentFile")) {
-                if (isempty(eq))
-                        r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 0);
-                else
-                        r = sd_bus_message_append(m, "(sv)", "EnvironmentFiles", "a(sb)", 1,
-                                                  eq[0] == '-' ? eq + 1 : eq,
-                                                  eq[0] == '-');
-                if (r < 0)
-                        return bus_log_create_error(r);
+        if (streq(field, "EnvironmentFile"))
+                return bus_append_environment_files(m, field, eq);
 
-                return 1;
-        }
 
         if (STR_IN_SET(field, "SetCredential", "SetCredentialEncrypted")) {
                 r = sd_bus_message_open_container(m, 'r', "sv");