Set $LANG to a setting instead of the language's name, and change what

sscanf looks for to compensate for spaces in lang-table fields.

2 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a3014c4aa..a9d5e8c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-30  Chris Lumens  <clumens@redhat,com>
+
+	* loader2/lang.c (loadLanguageList):  Language names may now contain
+	spaces, which sscanf splits on.  Change what it's looking for.
+	* loader2/lang.c (setLangEnv):  Don't set $LANG to the language's name.
+
 2005-03-29  Chris Lumens  <clumens@redhat.com>
 
 	* language.py (InstallTimeLanguage.__init__):  Fix string split.
diff --git a/loader2/lang.c b/loader2/lang.c
index 6cb22284e..8b1316450 100644
--- a/loader2/lang.c
+++ b/loader2/lang.c
@@ -108,8 +108,8 @@ static void loadLanguageList(int flags) {
     while (fgets(line, sizeof(line), f)) {
         lineNum++;
         languages = realloc(languages, sizeof(*languages) * (numLanguages + 1));
-        if (sscanf(line, "%s\t%s\t%s\t%s\t%s\t%s\n", name, key, font, 
-                   code, keyboard, timezone) != 6) {
+        if (sscanf(line, "%[^\t]\t%[^\t]\t%[^\t]\t%[^\t]\t%[^\t]\t%[^\t]\n",
+                   name, key, font, code, keyboard, timezone) != 6) {
             printf("bad line %d in lang-table", lineNum);
             logMessage("bad line %d in lang-table", lineNum);
         } else {
@@ -215,7 +215,7 @@ static void setLangEnv (int i, int flags) {
     if (!strcmp(languages[i].font, "None"))
         return;
 
-    setenv("LANG", languages[i].lang, 1);
+    setenv("LANG", languages[i].lc_all, 1);
     setenv("LANGKEY", languages[i].key, 1);
     setenv("LINGUAS", languages[i].lang, 1);
     loadLanguage (NULL, flags);