160 lines
8.3 KiB
C
160 lines
8.3 KiB
C
--- ../sal/osl/unx/nlsupport.c.orig Tue Jan 28 15:51:36 2003
|
|
+++ ../sal/osl/unx/nlsupport.c Wed Mar 5 21:03:13 2003
|
|
@@ -63,7 +63,7 @@
|
|
#include <osl/diagnose.h>
|
|
#include <osl/process.h>
|
|
|
|
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
|
|
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
|
|
#include <pthread.h>
|
|
#include <locale.h>
|
|
#include <langinfo.h>
|
|
@@ -114,8 +114,7 @@
|
|
comparison = _pair_compare( key, base + current );
|
|
if (comparison < 0)
|
|
upper = current;
|
|
- else
|
|
- if (comparison > 0)
|
|
+ else if (comparison > 0)
|
|
lower = current + 1;
|
|
else
|
|
return base + current;
|
|
@@ -241,12 +240,14 @@
|
|
return NULL;
|
|
}
|
|
|
|
-#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD)
|
|
+#if defined(LINUX) || defined(SOLARIS) || defined(IRIX) || defined(NETBSD) || defined(FREEBSD)
|
|
|
|
/*
|
|
- * This implementation of osl_getTextEncodingFromLocale maps
|
|
- * from nl_langinfo(CODESET) to rtl_textencoding defines.
|
|
- * nl_langinfo() is supported only on Linux, Solaris and IRIX.
|
|
+ * This implementation of osl_getTextEncodingFromLocale maps
|
|
+ * from nl_langinfo(CODESET) to rtl_textencoding defines.
|
|
+ * nl_langinfo() is supported only on Linux and Solaris.
|
|
+ * nl_langinfo() is supported only on Linux, Solaris and IRIX,
|
|
+ * >= NetBSD 1.6 and >= FreeBSD 4.4
|
|
*
|
|
* This routine is SLOW because of the setlocale call, so
|
|
* grab the result and cache it.
|
|
@@ -260,6 +261,12 @@
|
|
#endif
|
|
#endif
|
|
|
|
+/*
|
|
+ * _nl_language_list[] is an array list of supported encodings. Because
|
|
+ * we are using a binary search, the list has to be in ascending order.
|
|
+ * We are comparing the encodings case insensitiv, so the list has
|
|
+ * to be completly upper- , or lowercase.
|
|
+ */
|
|
|
|
#if defined(SOLARIS)
|
|
|
|
@@ -300,23 +307,23 @@
|
|
#elif defined(IRIX)
|
|
|
|
const _pair _nl_language_list[] = {
|
|
- { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
|
- { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
|
- { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
|
- { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
|
- { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
|
- { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
|
- { "eucJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
|
- { "eucKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
|
- { "eucCN", RTL_TEXTENCODING_EUC_CN }, /* China */
|
|
- { "eucTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
|
|
- { "big5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
|
- { "eucgbk", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
|
|
- { "gbk", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
|
|
- { "sjis", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
|
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
|
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China */
|
|
+ { "EUCGBK", RTL_TEXTENCODING_DONTKNOW }, /* China - Simplified Chinese */
|
|
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
|
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
|
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* Taiwan - Traditional Chinese */
|
|
+ { "GBK", RTL_TEXTENCODING_GBK }, /* China - Simplified Chinese */
|
|
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
|
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
|
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
|
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
|
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
|
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
|
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS } /* Japan */
|
|
};
|
|
|
|
-#elif defined(LINUX) || defined(NETBSD)
|
|
+#elif defined(LINUX)
|
|
|
|
const _pair _nl_language_list[] = {
|
|
{ "ANSI_X3.110-1983", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-99 NAPLPS */
|
|
@@ -491,13 +498,65 @@
|
|
{ "T.101-G2", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-128 */
|
|
{ "T.61-7BIT", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-102 */
|
|
{ "T.61-8BIT", RTL_TEXTENCODING_DONTKNOW }, /* T.61 ISO-IR-103 */
|
|
- { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */
|
|
+ { "TIS-620", RTL_TEXTENCODING_MS_874 }, /* locale: th_TH */
|
|
{ "UTF-8", RTL_TEXTENCODING_UTF8 }, /* ISO-10646/UTF-8 */
|
|
{ "VIDEOTEX-SUPPL", RTL_TEXTENCODING_DONTKNOW }, /* ISO-IR-70 */
|
|
{ "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */
|
|
};
|
|
|
|
-#endif /* ifdef LINUX || NETBSD */
|
|
+#elif defined(FREEBSD)
|
|
+
|
|
+const _pair _nl_language_list[] = {
|
|
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
|
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
|
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
|
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
|
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
|
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
|
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
|
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
|
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
|
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
|
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
|
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
|
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
|
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
|
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */
|
|
+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */
|
|
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
|
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
|
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
|
+};
|
|
+
|
|
+#elif defined(NETBSD)
|
|
+
|
|
+const _pair _nl_language_list[] = {
|
|
+ { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
|
+ { "BIG5", RTL_TEXTENCODING_BIG5 }, /* China - Traditional Chinese */
|
|
+ { "CP1251", RTL_TEXTENCODING_MS_1251 }, /* MS-CYRL */
|
|
+ { "CP866", RTL_TEXTENCODING_IBM_866 }, /* CP866 866 */
|
|
+ { "CTEXT", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
|
+ { "EUCCN", RTL_TEXTENCODING_EUC_CN }, /* China - Simplified Chinese */
|
|
+ { "EUCJP", RTL_TEXTENCODING_EUC_JP }, /* Japan */
|
|
+ { "EUCKR", RTL_TEXTENCODING_EUC_KR }, /* Korea */
|
|
+ { "EUCTW", RTL_TEXTENCODING_EUC_TW }, /* China - Traditional Chinese */
|
|
+ { "ISO-2022-JP", RTL_TEXTENCODING_DONTKNOW }, /* */
|
|
+ { "ISO-2022-JP-2", RTL_TEXTENCODING_DONTKNOW }, /* */
|
|
+ { "ISO8859-1", RTL_TEXTENCODING_ISO_8859_1 }, /* Western */
|
|
+ { "ISO8859-15", RTL_TEXTENCODING_ISO_8859_15 }, /* Western Updated (w/Euro sign) */
|
|
+ { "ISO8859-2", RTL_TEXTENCODING_ISO_8859_2 }, /* Central European */
|
|
+ { "ISO8859-4", RTL_TEXTENCODING_ISO_8859_4 }, /* LATIN4 L4 */
|
|
+ { "ISO8859-5", RTL_TEXTENCODING_ISO_8859_5 }, /* Cyrillic */
|
|
+ { "ISO8859-7", RTL_TEXTENCODING_ISO_8859_7 }, /* Greek */
|
|
+ { "ISO8859-9", RTL_TEXTENCODING_ISO_8859_9 }, /* Turkish */
|
|
+ { "KOI8-R", RTL_TEXTENCODING_KOI8_R }, /* KOI8-R */
|
|
+ { "KOI8-U", RTL_TEXTENCODING_KOI8_U }, /* KOI8-U */
|
|
+ { "SJIS", RTL_TEXTENCODING_SHIFT_JIS }, /* Japan */
|
|
+ { "US-ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */
|
|
+ { "UTF-8", RTL_TEXTENCODING_UTF8 } /* ISO-10646/UTF-8 */
|
|
+};
|
|
+
|
|
+#endif /* ifdef SOLARIS IRIX LINUX FREEBSD NETBSD */
|
|
|
|
static pthread_mutex_t aLocalMutex = PTHREAD_MUTEX_INITIALIZER;
|
|
|