Re-add support for BeOS, broken by DJGPP patches.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 97cc9adc74c95a5657bb619cd5dfe091dd870709..7648b962d309bfb9bb0e9aa91181935d510dbdbe 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2001-03-10  Bruno Haible  <haible@clisp.cons.org>
+
+       * localcharset.c (locale_charset): Allow wildcard syntax. Resolve
+       alias also if codeset is empty.
+       * config.charset (BeOS): Use wildcard syntax.
+
 2001-03-09  Bruno Haible  <haible@clisp.cons.org>
 
        * config.charset: Update from libiconv-1.6.

diff --git a/lib/config.charset b/lib/config.charset
index 0844094875a8305e312e8e6349039caa90577f3a..d6f369558d1d4ff9033e664ef31f242f0d3aee92 100755 (executable)
--- a/lib/config.charset
+++ b/lib/config.charset
@@ -272,7 +272,7 @@ case "$os" in
        ;;
     beos*)
        # BeOS has a single locale, and it has UTF-8 encoding.
-       echo "C UTF-8"
+       echo "* UTF-8"
        ;;
     msdosdjgpp*)
        # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 201483cef07e2027c3be937e8b3cd8753dbe584c..22e09e410a9682ad919c66044d8c0ca25d738993 100644 (file)
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -255,18 +255,17 @@ locale_charset ()
   if (codeset == NULL)
     /* The canonical name cannot be determined.  */
     codeset = "";
-  else if (codeset[0] != '\0')
-    {
-      /* Resolve alias. */
-      for (aliases = get_charset_aliases ();
-          *aliases != '\0';
-          aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
-       if (!strcmp (codeset, aliases))
-         {
-           codeset = aliases + strlen (aliases) + 1;
-           break;
-         }
-    }
+
+  /* Resolve alias. */
+  for (aliases = get_charset_aliases ();
+       *aliases != '\0';
+       aliases += strlen (aliases) + 1, aliases += strlen (aliases) + 1)
+    if (strcmp (codeset, aliases) == 0
+       || (aliases[0] == '*' && aliases[1] == '\0'))
+      {
+       codeset = aliases + strlen (aliases) + 1;
+       break;
+      }
 
   return codeset;
 }