locale: unset locale vars that are not set any longer

2010-09-21 01:40:34 +02:00
parent 97e3d13fb4
commit 8780d48d86
1 changed files with 8 additions and 8 deletions
@@ -166,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: