lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
2002-04-28  Ulrich Drepper  <drepper@redhat.com>

	* intl/loadmsgcat.c [!_LIBC] (_nl_init_domain_conv): Don't add
	//TRANSLIT twice.
This commit is contained in:
Ulrich Drepper
2002-04-29 02:53:27 +00:00
parent a5d07eb215
commit bc3bb89c0a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-04-28 Ulrich Drepper <drepper@redhat.com>
* intl/loadmsgcat.c [!_LIBC] (_nl_init_domain_conv): Don't add
//TRANSLIT twice.
2002-04-27 Ulrich Drepper <drepper@redhat.com> 2002-04-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/ia64/fxstat.c: Fix a few issues with the * sysdeps/unix/sysv/linux/ia64/fxstat.c: Fix a few issues with the

15
intl/loadmsgcat.c
View File

@ -1,5 +1,5 @@
/* Load needed message catalogs. /* Load needed message catalogs.
Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -201,12 +201,13 @@ _nl_init_domain_conv (domain_file, domain, domainbinding)
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \
|| _LIBICONV_VERSION >= 0x0105 || _LIBICONV_VERSION >= 0x0105
len = strlen (outcharset); len = strlen (outcharset);
{ if (len < 10 || strcmp (outcharset + len - 9, "/TRANSLIT") != 0)
char *tmp = (char *) alloca (len + 10 + 1); {
memcpy (tmp, outcharset, len); char *tmp = (char *) alloca (len + 10 + 1);
memcpy (tmp + len, "//TRANSLIT", 10 + 1); memcpy (tmp, outcharset, len);
outcharset = tmp; memcpy (tmp + len, "//TRANSLIT", 10 + 1);
} outcharset = tmp;
}
# endif # endif
domain->conv = iconv_open (outcharset, charset); domain->conv = iconv_open (outcharset, charset);
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \