X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale-setup.c;h=8ead9fdd9d27891835188dfd3dee491e2eac4648;hb=8780d48d86d921a8245febdde7888cd89ad3631b;hp=675a739a5c44656e714d273d8010745159073dd6;hpb=f2fcd59ffaaa97aaa238089cde5225f0e1086904;p=elogind.git

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 675a739a5..8ead9fdd9 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -28,6 +28,9 @@
 #include "macro.h"
 
 enum {
+        /* We don't list LC_ALL here on purpose. People should be
+         * using LANG instead. */
+
         VARIABLE_LANG,
         VARIABLE_LC_CTYPE,
         VARIABLE_LC_NUMERIC,
@@ -35,7 +38,6 @@ enum {
         VARIABLE_LC_COLLATE,
         VARIABLE_LC_MONETARY,
         VARIABLE_LC_MESSAGES,
-        VARIABLE_LC_ALL,
         VARIABLE_LC_PAPER,
         VARIABLE_LC_NAME,
         VARIABLE_LC_ADDRESS,
@@ -53,7 +55,6 @@ static const char * const variable_names[_VARIABLE_MAX] = {
         [VARIABLE_LC_COLLATE] = "COLLATE",
         [VARIABLE_LC_MONETARY] = "MONETARY",
         [VARIABLE_LC_MESSAGES] = "MESSAGE",
-        [VARIABLE_LC_ALL] = "ALL",
         [VARIABLE_LC_PAPER] = "PAPER",
         [VARIABLE_LC_NAME] = "NAME",
         [VARIABLE_LC_ADDRESS] = "ADDRESS",
@@ -77,13 +78,38 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r));
         }
 #elif defined(TARGET_ARCH)
-	if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
-				"LOCALE", &variables[VARIABLE_LANG],
-				NULL)) < 0) {
+        if ((r = parse_env_file("/etc/rc.conf", NEWLINE,
+                                "LOCALE", &variables[VARIABLE_LANG],
+                                NULL)) < 0) {
 
-		if (r != -ENOENT)
-			log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
-	}
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
+        }
+#elif defined(TARGET_GENTOO)
+        /* Gentoo's openrc expects locale variables in /etc/env.d/
+         * These files are later compiled by env-update into shell
+         * export commands at /etc/profile.env, with variables being
+         * exported by openrc's runscript (so /etc/init.d/)
+         */
+        if ((r = parse_env_file("/etc/profile.env", NEWLINE,
+                                "export LANG",              &variables[VARIABLE_LANG],
+                                "export LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
+                                "export LC_NUMERIC",        &variables[VARIABLE_LC_NUMERIC],
+                                "export LC_TIME",           &variables[VARIABLE_LC_TIME],
+                                "export LC_COLLATE",        &variables[VARIABLE_LC_COLLATE],
+                                "export LC_MONETARY",       &variables[VARIABLE_LC_MONETARY],
+                                "export LC_MESSAGES",       &variables[VARIABLE_LC_MESSAGES],
+                                "export LC_PAPER",          &variables[VARIABLE_LC_PAPER],
+                                "export LC_NAME",           &variables[VARIABLE_LC_NAME],
+                                "export LC_ADDRESS",        &variables[VARIABLE_LC_ADDRESS],
+                                "export LC_TELEPHONE",      &variables[VARIABLE_LC_TELEPHONE],
+                                "export LC_MEASUREMENT",    &variables[VARIABLE_LC_MEASUREMENT],
+                                "export LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION],
+                                NULL)) < 0) {
+
+                if (r != -ENOENT)
+                        log_warning("Failed to read /etc/profile.env: %s", strerror(-r));
+        }
 #endif
 
         /* Override distribution-specific options with the
@@ -96,7 +122,6 @@ int locale_setup(void) {
                                 "LC_COLLATE",        &variables[VARIABLE_LC_COLLATE],
                                 "LC_MONETARY",       &variables[VARIABLE_LC_MONETARY],
                                 "LC_MESSAGES",       &variables[VARIABLE_LC_MESSAGES],
-                                "LC_ALL",            &variables[VARIABLE_LC_ALL],
                                 "LC_PAPER",          &variables[VARIABLE_LC_PAPER],
                                 "LC_NAME",           &variables[VARIABLE_LC_NAME],
                                 "LC_ADDRESS",        &variables[VARIABLE_LC_ADDRESS],
@@ -120,7 +145,6 @@ int locale_setup(void) {
                                 "locale.LC_COLLATE",        &variables[VARIABLE_LC_COLLATE],
                                 "locale.LC_MONETARY",       &variables[VARIABLE_LC_MONETARY],
                                 "locale.LC_MESSAGES",       &variables[VARIABLE_LC_MESSAGES],
-                                "locale.LC_ALL",            &variables[VARIABLE_LC_ALL],
                                 "locale.LC_PAPER",          &variables[VARIABLE_LC_PAPER],
                                 "locale.LC_NAME",           &variables[VARIABLE_LC_NAME],
                                 "locale.LC_ADDRESS",        &variables[VARIABLE_LC_ADDRESS],
@@ -142,15 +166,15 @@ int locale_setup(void) {
 
         for (i = 0; i < _VARIABLE_MAX; i++) {
 
-                if (!variables[i])
-                        continue;
-
-                if (setenv(variable_names[i], variables[i], 1) < 0) {
-                        r = -errno;
-                        goto finish;
-                }
-
+                if (variables[i]) {
+                        if (setenv(variable_names[i], variables[i], 1) < 0) {
+                                r = -errno;
+                                goto finish;
+                        }
+                } else
+                        unsetenv(variable_names[i]);
         }
+
         r = 0;
 
 finish: