This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
A patch for gconv
- To: GNU C Library <libc-alpha at sourceware dot cygnus dot com>
- Subject: A patch for gconv
- From: "H . J . Lu" <hjl at valinux dot com>
- Date: Thu, 23 Nov 2000 10:09:08 -0800
Sometimes, it is fatal to use /usr/lib/gconv/gconv-modules under glibc
2.1.3/ia64 during "make check". This patch adds NO_DEFAULT_GCONV_PATH
so that when we can disable it if necessary.
--
H.J. Lu (hjl@valinux.com)
----
2000-11-23 H.J. Lu <hjl@gnu.org>
* iconv/gconv_conf.c (__gconv_get_path): Don't use the
default GCONV_PATH if NO_DEFAULT_GCONV_PATH is set in env.
* iconvdata/run-iconv-test.sh: Set and export
NO_DEFAULT_GCONV_PATH.
* iconvdata/tst-table.sh: Likewise.
* intl/tst-translit.sh: Likewise.
Index: iconv/gconv_conf.c
===================================================================
RCS file: /work/cvs/gnu/glibc/iconv/gconv_conf.c,v
retrieving revision 1.1.1.9
diff -u -p -r1.1.1.9 gconv_conf.c
--- iconv/gconv_conf.c 2000/11/21 02:14:51 1.1.1.9
+++ iconv/gconv_conf.c 2000/11/23 07:56:01
@@ -432,11 +432,23 @@ __gconv_get_path (void)
/* Append the default path to the user-defined path. */
size_t user_len = strlen (user_path);
- gconv_path_len = user_len + 1 + sizeof (default_gconv_path);
- gconv_path = alloca (gconv_path_len);
- __mempcpy (__mempcpy (__mempcpy (gconv_path, user_path, user_len),
- ":", 1),
- default_gconv_path, sizeof (default_gconv_path));
+ if (getenv ("NO_DEFAULT_GCONV_PATH"))
+ {
+ gconv_path_len = user_len + 1;
+ gconv_path = alloca (gconv_path_len);
+ strcpy (gconv_path, user_path);
+ }
+ else
+ {
+ gconv_path_len = user_len + 1
+ + sizeof (default_gconv_path);
+ gconv_path = alloca (gconv_path_len);
+ __mempcpy (__mempcpy (__mempcpy (gconv_path, user_path,
+ user_len),
+ ":", 1),
+ default_gconv_path,
+ sizeof (default_gconv_path));
+ }
cwd = __getcwd (NULL, 0);
cwdlen = strlen (cwd);
}
Index: iconvdata/run-iconv-test.sh
===================================================================
RCS file: /work/cvs/gnu/glibc/iconvdata/run-iconv-test.sh,v
retrieving revision 1.1.1.4
diff -u -p -r1.1.1.4 run-iconv-test.sh
--- iconvdata/run-iconv-test.sh 2000/11/07 01:28:07 1.1.1.4
+++ iconvdata/run-iconv-test.sh 2000/11/23 07:55:43
@@ -31,6 +31,8 @@ trap "rm -f $temp1 $temp2" 1 2 3 15
# be found.
GCONV_PATH=$codir/iconvdata
export GCONV_PATH
+NO_DEFAULT_GCONV_PATH=1
+export NO_DEFAULT_GCONV_PATH
# We have to have some directories in the library path.
LIBPATH=$codir:$codir/iconvdata
Index: iconvdata/tst-table.sh
===================================================================
RCS file: /work/cvs/gnu/glibc/iconvdata/tst-table.sh,v
retrieving revision 1.1.1.3
diff -u -p -r1.1.1.3 tst-table.sh
--- iconvdata/tst-table.sh 2000/10/19 02:39:10 1.1.1.3
+++ iconvdata/tst-table.sh 2000/11/23 07:58:14
@@ -28,6 +28,8 @@ charmap=$4
GCONV_PATH=${common_objpfx}iconvdata
export GCONV_PATH
+NO_DEFAULT_GCONV_PATH=1
+export NO_DEFAULT_GCONV_PATH
LC_ALL=C
export LC_ALL
Index: intl/tst-translit.sh
===================================================================
RCS file: /work/cvs/gnu/glibc/intl/tst-translit.sh,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 tst-translit.sh
--- intl/tst-translit.sh 2000/07/17 04:01:02 1.1.1.1
+++ intl/tst-translit.sh 2000/11/23 08:03:53
@@ -23,6 +23,8 @@ objpfx=$2
GCONV_PATH=${common_objpfx}iconvdata
export GCONV_PATH
+NO_DEFAULT_GCONV_PATH=1
+export NO_DEFAULT_GCONV_PATH
LOCPATH=${common_objpfx}localedata
export LOCPATH
LC_ALL=C