luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-07 19:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some point.

Browse Source 
2004-04-23  Matthias Clasen  <mclasen@redhat.com>

	* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
	Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
	point.  (#139134, Piotr Klaban)
This commit is contained in:
Matthias Clasen 2004-04-23 14:47:44 +00:00 committed by Matthias Clasen
parent b26e8861c1
commit f5eb6acc72
9 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
ChangeLog.pre-2-12
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
ChangeLog.pre-2-4
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com> 2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/libcharset/localcharset.c (_g_locale_get_charset_aliases):
Reinstate LIBCHARSET_ALIAS_DIR support which got lost at some
point. (#139134, Piotr Klaban)
* glib/gconvert.c (open_converter): Don't call g_strerror() here, * glib/gconvert.c (open_converter): Don't call g_strerror() here,
since it can lead to infinite recursion. (#139133, Piotr Klaban) since it can lead to infinite recursion. (#139133, Piotr Klaban)

4
docs/reference/ChangeLog
View File

@ -1,3 +1,7 @@
2004-04-23 Matthias Clasen <mclasen@redhat.com>
* glib/running.sgml: Document LIBCHARSET_ALIAS_DIR.
2004-04-15 Matthias Clasen <mclasen@redhat.com> 2004-04-15 Matthias Clasen <mclasen@redhat.com>
* glib/tmpl/types.sgml: Correct the description of the * glib/tmpl/types.sgml: Correct the description of the

11
docs/reference/glib/running.sgml
View File

@ -86,6 +86,17 @@ variables like <envar>LANG</envar>, <envar>PATH</envar> or <envar>HOME</envar>.
</para> </para>
</formalpara> </formalpara>
<formalpara>
<title><envar>LIBCHARSET_ALIAS_DIR</envar></title>
<para>
Allows to specify a nonstandard location for the
<filename>charset.aliases</filename> file that is used by the
character set conversion routines. The default location is the
<replaceable>libdir</replaceable> specified at compilation time.
</para>
</formalpara>
</refsect2> </refsect2>
<refsect2> <refsect2>

5
glib/libcharset/localcharset.c
View File

@ -119,10 +119,13 @@ _g_locale_get_charset_aliases ()
{ {
#if !defined WIN32 #if !defined WIN32
FILE *fp; FILE *fp;
const char *dir = LIBDIR; const char *dir = getenv ("LIBCHARSET_ALIAS_DIR");
const char *base = "charset.alias"; const char *base = "charset.alias";
char *file_name; char *file_name;
if (dir == NULL)
dir = LIBDIR;
/* Concatenate dir and base into freshly allocated file_name. */ /* Concatenate dir and base into freshly allocated file_name. */
{ {
size_t dir_len = strlen (dir); size_t dir_len = strlen (dir);