Do not set LANG=C in every child environment.

[elogind.git] / src / core / locale-setup.c

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 48b59bf4486fc60efd53f2506c2ca726d40f69a1..daf81d080e026f92c8ac60c443d5f92b1562195d 100644 (file)
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -27,6 +27,7 @@
 #include "util.h"
 #include "macro.h"
 #include "virt.h"
+#include "fileio.h"
 
 enum {
         /* We don't list LC_ALL here on purpose. People should be
@@ -67,11 +68,9 @@ static const char * const variable_names[_VARIABLE_MAX] = {
 };
 
 int locale_setup(void) {
-        char *variables[_VARIABLE_MAX];
+        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,14 +117,6 @@ 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]) {
-                        r = -ENOMEM;
-                        goto finish;
-                }
-        }
-
         for (i = 0; i < _VARIABLE_MAX; i++) {
                 if (variables[i]) {
                         if (setenv(variable_names[i], variables[i], 1) < 0) {