2005-03-29 Jeremy Katz <katzj@redhat.com>

	* loader2/lang.c: Fix for removed instlang line.  Require tabs for
	spacing language information.
	* loader2/lang.h: Remove instlang.

3 files changed, 16 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index d4d3ebf12..9974e8356 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-29  Jeremy Katz  <katzj@redhat.com>
+
+	* loader2/lang.c: Fix for removed instlang line.  Require tabs for
+	spacing language information.
+	* loader2/lang.h: Remove instlang.
+
 2005-03-28  Peter Jones  <pjones@redhat.com>
 	* partitions.py, partRequests.py: don't put snapshot LVs into
 	RequestSpecs after all.  Instead, look for children when we
diff --git a/loader2/lang.c b/loader2/lang.c
index 7ddc79acd..e6c342f12 100644
--- a/loader2/lang.c
+++ b/loader2/lang.c
@@ -95,7 +95,7 @@ static void loadLanguageList(int flags) {
     FILE * f;
     char line[256];
     char name[256], key[256], font[256], code[256],
-         keyboard[256], timezone[256], instlang[256];
+        keyboard[256], timezone[256];
     int lineNum = 0;
 
     f = fopen(file, "r");
@@ -108,16 +108,16 @@ static void loadLanguageList(int flags) {
     while (fgets(line, sizeof(line), f)) {
         lineNum++;
         languages = realloc(languages, sizeof(*languages) * (numLanguages + 1));
-        if (sscanf(line, "%s %s %s %s %s %s %s\n", name, key, font, 
-                   code, keyboard, timezone, instlang) != 7) {
+        if (sscanf(line, "%s\t%s\t%s\t%s\t%s\t%s\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 {
             languages[numLanguages].lang = strdup(name);
             languages[numLanguages].key = strdup(key);
             languages[numLanguages].font = strdup(font);
             languages[numLanguages].lc_all = strdup(code);
-            languages[numLanguages].keyboard = strdup(keyboard);
-            languages[numLanguages++].instlang = strdup(instlang);
+            languages[numLanguages++].keyboard = strdup(keyboard);
         }
     }
     fclose(f);
@@ -215,9 +215,9 @@ static void setLangEnv (int i, int flags) {
     if (!strcmp(languages[i].font, "None"))
         return;
 
-    setenv("LANG", languages[i].instlang, 1);
+    setenv("LANG", languages[i].lang, 1);
     setenv("LANGKEY", languages[i].key, 1);
-    setenv("LINGUAS", languages[i].instlang, 1);
+    setenv("LINGUAS", languages[i].lang, 1);
     loadLanguage (NULL, flags);
 }
 
@@ -358,10 +358,11 @@ int chooseLanguage(char ** lang, int flags) {
     langs = alloca(sizeof(*langs) * (numLanguages + 1)); 
 
     for (i = 0; i < numLanguages; i++) {
+        printf("foo\n");
         if (!strncmp(languages[i].key, "en", 2))
             english = numLangs;
         if (currentLangName &&
-            !strcmp(languages[i].instlang, currentLangName))
+            !strcmp(languages[i].lang, currentLangName))
             current = numLangs;
 
         langs[numLangs++] = languages[i].lang;
diff --git a/loader2/lang.h b/loader2/lang.h
index e2517934e..0134b65ea 100644
--- a/loader2/lang.h
+++ b/loader2/lang.h
@@ -7,7 +7,7 @@
 #define N_(foo) (foo)
 
 struct langInfo {
-    char * lang, * key, * font, * lc_all, * keyboard, * instlang;
+    char * lang, * key, * font, * lc_all, * keyboard;
 } ;