duplocale: Add support for glibc 2.3.x.

diff --git a/ChangeLog b/ChangeLog
index 3bb6922c472db24bf3aa5f91b63b1e218ac44210..7b0217c001d61d0ffae5de932465e30e47d17fbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-23  Bruno Haible  <bruno@clisp.org>
+
+       duplocale: Add support for glibc 2.3.x.
+       * lib/duplocale.c (rpl_duplocale): Add fallback code for glibc 2.3.x.
+
 2009-11-22  Bruno Haible  <bruno@clisp.org>
 
        vasnprintf: Tiny optimization.

diff --git a/lib/duplocale.c b/lib/duplocale.c
index 63d00d9a6c8fa39ad84fb976c1acd267682a3e19..78819cf531368ea33254b8bc45739626b89fe28e 100644 (file)
--- a/lib/duplocale.c
+++ b/lib/duplocale.c
@@ -70,10 +70,16 @@ rpl_duplocale (locale_t locale)
          , { LC_IDENTIFICATION, LC_IDENTIFICATION_MASK }
 #endif
        };
-      const char *base_name = nl_langinfo (_NL_LOCALE_NAME (LC_CTYPE));
-      locale_t base_copy = newlocale (LC_ALL_MASK, base_name, NULL);
+      const char *base_name;
+      locale_t base_copy;
       unsigned int i;
 
+      base_name = nl_langinfo (_NL_LOCALE_NAME (LC_CTYPE));
+      if (base_name[0] == '\0')
+       /* Fallback code for glibc < 2.4, which did not implement
+          nl_langinfo (_NL_LOCALE_NAME (category)).  */
+       base_name = setlocale (LC_CTYPE, NULL);
+      base_copy = newlocale (LC_ALL_MASK, base_name, NULL);
       if (base_copy == NULL)
        return NULL;
 
@@ -82,6 +88,10 @@ rpl_duplocale (locale_t locale)
          int category = categories[i].cat;
          int category_mask = categories[i].mask;
          const char *name = nl_langinfo (_NL_LOCALE_NAME (category));
+         if (name[0] == '\0')
+           /* Fallback code for glibc < 2.4, which did not implement
+              nl_langinfo (_NL_LOCALE_NAME (category)).  */
+           name = setlocale (category, NULL);
          if (strcmp (name, base_name) != 0)
            {
              locale_t copy = newlocale (category_mask, name, base_copy);