summaryrefslogtreecommitdiff
path: root/intl/localcharset.c
diff options
context:
space:
mode:
Diffstat (limited to 'intl/localcharset.c')
-rw-r--r--intl/localcharset.c49
1 files changed, 39 insertions, 10 deletions
diff --git a/intl/localcharset.c b/intl/localcharset.c
index 2b1564e2..4865f103 100644
--- a/intl/localcharset.c
+++ b/intl/localcharset.c
@@ -1,6 +1,6 @@
/* Determine a canonical name for the current locale's character encoding.
- Copyright (C) 2000-2002 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
@@ -23,6 +23,9 @@
# include <config.h>
#endif
+/* Specification. */
+#include "localcharset.h"
+
#if HAVE_STDDEF_H
# include <stddef.h>
#endif
@@ -64,6 +67,12 @@
# include <os2.h>
#endif
+#if ENABLE_RELOCATABLE
+# include "relocatable.h"
+#else
+# define relocate(pathname) (pathname)
+#endif
+
#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__
/* Win32, OS/2, DOS */
# define ISSLASH(C) ((C) == '/' || (C) == '\\')
@@ -77,16 +86,11 @@
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
-#ifdef HAVE_GETC_UNLOCKED
+#if HAVE_DECL_GETC_UNLOCKED
# undef getc
# define getc getc_unlocked
#endif
-#ifdef __cplusplus
-/* When compiling with "gcc -x c++", produce a function with C linkage. */
-extern "C" const char * locale_charset (void);
-#endif
-
/* The following static variable is declared 'volatile' to avoid a
possible multithread problem in the function get_charset_aliases. If we
are running in a threaded environment, and if two threads initialize
@@ -110,9 +114,9 @@ get_charset_aliases ()
cp = charset_aliases;
if (cp == NULL)
{
-#if !defined WIN32
+#if !(defined VMS || defined WIN32)
FILE *fp;
- const char *dir = LIBDIR;
+ const char *dir = relocate (LIBDIR);
const char *base = "charset.alias";
char *file_name;
@@ -200,11 +204,36 @@ get_charset_aliases ()
#else
+# if defined VMS
+ /* To avoid the troubles of an extra file charset.alias_vms in the
+ sources of many GNU packages, simply inline the aliases here. */
+ /* The list of encodings is taken from the OpenVMS 7.3-1 documentation
+ "Compaq C Run-Time Library Reference Manual for OpenVMS systems"
+ section 10.7 "Handling Different Character Sets". */
+ cp = "ISO8859-1" "\0" "ISO-8859-1" "\0"
+ "ISO8859-2" "\0" "ISO-8859-2" "\0"
+ "ISO8859-5" "\0" "ISO-8859-5" "\0"
+ "ISO8859-7" "\0" "ISO-8859-7" "\0"
+ "ISO8859-8" "\0" "ISO-8859-8" "\0"
+ "ISO8859-9" "\0" "ISO-8859-9" "\0"
+ /* Japanese */
+ "eucJP" "\0" "EUC-JP" "\0"
+ "SJIS" "\0" "SHIFT_JIS" "\0"
+ "DECKANJI" "\0" "DEC-KANJI" "\0"
+ "SDECKANJI" "\0" "EUC-JP" "\0"
+ /* Chinese */
+ "eucTW" "\0" "EUC-TW" "\0"
+ "DECHANYU" "\0" "DEC-HANYU" "\0"
+ "DECHANZI" "\0" "GB2312" "\0"
+ /* Korean */
+ "DECKOREAN" "\0" "EUC-KR" "\0";
+# endif
+
+# if defined WIN32
/* To avoid the troubles of installing a separate file in the same
directory as the DLL and of retrieving the DLL's directory at
runtime, simply inline the aliases here. */
-# if defined WIN32
cp = "CP936" "\0" "GBK" "\0"
"CP1361" "\0" "JOHAB" "\0"
"CP20127" "\0" "ASCII" "\0"