X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Flocale-setup.c;h=31374ac644feef90a2fc3261109d4e5a414340c5;hb=3731acf1acfb4a6eb68374a5b137f3b368f63381;hp=48b59bf4486fc60efd53f2506c2ca726d40f69a1;hpb=46a2911bf2780f616396df5671dd901cc7cb54fd;p=elogind.git

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 48b59bf44..31374ac64 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -27,6 +27,8 @@
 #include "util.h"
 #include "macro.h"
 #include "virt.h"
+#include "fileio.h"
+#include "strv.h"
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
@@ -66,12 +68,11 @@ static const char * const variable_names[_VARIABLE_MAX] = {
         [VARIABLE_LC_IDENTIFICATION] = "LC_IDENTIFICATION"
 };
 
-int locale_setup(void) {
-        char *variables[_VARIABLE_MAX];
+int locale_setup(char ***environment) {
+        char **env;
+        char *variables[_VARIABLE_MAX] = {};
         int r = 0, i;
 
-        zero(variables);
-
         if (detect_container(NULL) <= 0) {
                 r = parse_env_file("/proc/cmdline", WHITESPACE,
                                    "locale.LANG",              &variables[VARIABLE_LANG],
@@ -118,22 +119,17 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
-        if (!variables[VARIABLE_LANG]) {
-                variables[VARIABLE_LANG] = strdup("C");
-                if (!variables[VARIABLE_LANG]) {
+        for (i = 0; i < _VARIABLE_MAX; i++) {
+                if (!variables[i])
+                        continue;
+
+                env = strv_appendf(*environment, "%s=%s", variable_names[i], variables[i]);
+                if (!env) {
                         r = -ENOMEM;
                         goto finish;
                 }
-        }
 
-        for (i = 0; i < _VARIABLE_MAX; i++) {
-                if (variables[i]) {
-                        if (setenv(variable_names[i], variables[i], 1) < 0) {
-                                r = -errno;
-                                goto finish;
-                        }
-                } else
-                        unsetenv(variable_names[i]);
+                *environment = env;
         }
 
         r = 0;