gettext.c: 'search' is now a fixed length string buffer.

[citadel.git] / webcit / gettext.c

diff --git a/webcit/gettext.c b/webcit/gettext.c
index 3596c5d7c5103d5bdc868f74800d49aa831632ad..3d86008f4997502efe65c8c9cafb7712cd015218 100644 (file)
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -11,7 +11,7 @@
 
 #ifdef ENABLE_NLS
 
-#define NUM_LANGS 5 /**< how many different locales do we know? */
+#define NUM_LANGS 7 /**< how many different locales do we know? */
 #define SEARCH_LANG 20 /**< how many langs should we parse? */
 
 /** actual supported locales */
@@ -20,7 +20,9 @@ char *AvailLang[NUM_LANGS] = {
        "en_US",
        "de_DE",
        "it_IT",
-       "en_GB"
+       "es_ES",
+       "en_GB",
+       "da_DK"
 };
 
 locale_t wc_locales[NUM_LANGS]; /**< here we keep the parsed stuff */
@@ -52,15 +54,14 @@ void httplang_to_locale(char *LocaleString)
 
        int i = 0;
        int j = 0;
-       size_t len = strlen(LocaleString);
+       /* size_t len = strlen(LocaleString); */
        long prio;
        int av;
        int nBest;
        int nParts;
-       char *search = (char *) malloc(len);
+       char search[1024];
        
-       memcpy(search, LocaleString, len);
-       search[len] = '\0';
+       safestrncpy(search, LocaleString, sizeof search);
        nParts=num_tokens(search,',');
        for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
         {
@@ -127,25 +128,23 @@ void httplang_to_locale(char *LocaleString)
        prio=0;
        av=-1000;
        nBest=-1;
-       for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++)
-               {
-                       ls=&wanted_locales[i];
-                       if ((ls->availability<=0)&& 
-                               (av<ls->availability)&&
-                               (prio<ls->priority)&&
-                               (ls->selectedlang!=-1)){
-                               nBest=ls->selectedlang;
-                               av=ls->availability;
-                               prio=ls->priority;
-                       }
+       for (i=0; ((i<nParts)&&(i<SEARCH_LANG)); i++) {
+               ls=&wanted_locales[i];
+               if ((ls->availability<=0)&& 
+                  (av<ls->availability)&&
+                  (prio<ls->priority)&&
+                  (ls->selectedlang!=-1)) {
+                       nBest=ls->selectedlang;
+                       av=ls->availability;
+                       prio=ls->priority;
                }
-       if (nBest==-1) /** fall back to C */
+       }
+       if (nBest == -1) {
+               /** fall back to C */
                nBest=0;
+       }
        WC->selected_language=nBest;
        lprintf(9, "language found: %s\n", AvailLang[WC->selected_language]);
-       if (search != NULL) {
-               free(search);
-       }
 }
 
 /* TODO: we skip the language weightening so far. */
@@ -251,11 +250,26 @@ void initialize_locales(void) {
        Empty_Locale = newlocale(LC_ALL_MASK, NULL, NULL);
 
        for (i = 0; i < NUM_LANGS; ++i) {
-               sprintf(buf, "%s.UTF8", AvailLang[i]);
-               wc_locales[i] = newlocale(LC_MESSAGES_MASK /* |LC_TIME_MASK FIXME */ ,
+               if (i == 0) {
+                       sprintf(buf, "%s", AvailLang[i]);       // locale 0 (C) is ascii, not utf-8
+               }
+               else {
+                       sprintf(buf, "%s.UTF8", AvailLang[i]);
+               }
+               wc_locales[i] = newlocale(
+                       (LC_MESSAGES_MASK|LC_TIME_MASK),
                        buf,
-                       Empty_Locale
+                       (((i > 0) && (wc_locales[0] != NULL)) ? wc_locales[0] : Empty_Locale)
                );
+               if (wc_locales[i] == NULL) {
+                       lprintf(1, "Error configuring locale for %s: %s\n",
+                               buf,
+                               strerror(errno)
+                       );
+               }
+               else {
+                       lprintf(3, "Configured available locale: %s\n", buf);
+               }
        }
 }