aboutsummaryrefslogtreecommitdiff
path: root/intl/loadmsgcat.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-04-28 05:12:30 +0000
committerUlrich Drepper <drepper@redhat.com>2000-04-28 05:12:30 +0000
commit0a55a284756cef31b9f0a25d9c6a0fc74c7a626f (patch)
treefd1cb046398d7f6a37a4f97b75da6ab093384cab /intl/loadmsgcat.c
parent0e4ee106c2a3cae0c6986bc54d18ffffd7c6d7e5 (diff)
downloadglibc-0a55a284756cef31b9f0a25d9c6a0fc74c7a626f.zip
glibc-0a55a284756cef31b9f0a25d9c6a0fc74c7a626f.tar.gz
glibc-0a55a284756cef31b9f0a25d9c6a0fc74c7a626f.tar.bz2
Update.
2000-04-27 Ulrich Drepper <drepper@redhat.com> * hesiod/nss_hesiod/hesiod-grp.c (_nss_hesiod_initgroups): Handle overflows in conversion from ASCII. 2000-04-26 Jakub Jelinek <jakub@redhat.com> * Makeconfig (full_config_sysdirs): Renamed from full-config-sysdirs. * Makerules (full_config_sysdirs): Likewise. * MakeTAGS (full_config_sysdirs): Likewise. 2000-04-26 Jakub Jelinek <jakub@redhat.com> * .cvsignore: Remove linuxthreads. * po/.cvsignore: Remove *.pot. * posix/glob/.cvsignore: Removed. * sysdeps/unix/bsd/osf/.cvsignore: Removed. 2000-04-25 Andreas Jaeger <aj@suse.de> * conform/Makefile (distribute): Also distribute contents of subdirectories. * Makerules (no_deps): Remove abi-versions.h. * nis/nis_print_group_entry.c: Include alloca.h for alloca prototype. 2000-04-25 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc64/elf/Dist: Remove. * sysdeps/sparc/sparc64/elf/crtbegin.S: Remove. * sysdeps/sparc/sparc64/elf/crtbeginS.S: Remove. * sysdeps/sparc/sparc64/elf/crtend.S: Remove. * sysdeps/sparc/sparc64/elf/crtendS.S: Remove. * sysdeps/sparc/sparc64/elf/Makefile: Don't build crtbegin/crtend objects. 2000-04-25 Thorsten Kukuk <kukuk@suse.de> * nscd/grpcache.c: Fix gr_name pointer [PR/1702]. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/dcigettext.c: Define _GNU_SOURCE as early as possible. * intl/l10nflist.c: Likewise. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/bindtextdom.c [!_LIBC]: Define __libc_rwlock_define, __libc_rwlock_wrlock, __libc_rwlock_unlock as empty. * intl/textdomain.c [!_LIBC]: Likewise. * intl/dcigettext.c [!_LIBC]: Define __libc_rwlock_define_initialized, __libc_rwlock_rdlock, __libc_rwlock_unlock as empty. * intl/loadmsgcat.c (_nl_load_domain) [!_LIBC, !HAVE_ICONV]: Avoid syntax error. 2000-04-23 Bruno Haible <clisp.cons.org> * intl/dcigettext.c (_nl_find_msg): Do the plural treatment and character set conversion also in the case the translation was found after a hash collision or through binary search. Store the maximum index together with the converted message. Use iconv() when available. In case of out of memory during conversion, return the unconverted translated string, not NULL.
Diffstat (limited to 'intl/loadmsgcat.c')
-rw-r--r--intl/loadmsgcat.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/intl/loadmsgcat.c b/intl/loadmsgcat.c
index a03fe0d..75265c8 100644
--- a/intl/loadmsgcat.c
+++ b/intl/loadmsgcat.c
@@ -257,10 +257,12 @@ _nl_load_domain (domain_file)
nullentry = _nl_find_msg (domain_file, "", 0);
if (nullentry != NULL)
{
- const char *charsetstr = strstr (nullentry, "charset=");
+ const char *charsetstr;
const char *plural;
const char *nplurals;
+#if defined _LIBC || HAVE_ICONV
+ charsetstr = strstr (nullentry, "charset=");
if (charsetstr != NULL)
{
size_t len;
@@ -271,12 +273,12 @@ _nl_load_domain (domain_file)
len = strcspn (charsetstr, " \t\n");
charset = (char *) alloca (len + 1);
-#if defined _LIBC || HAVE_MEMPCPY
+# if defined _LIBC || HAVE_MEMPCPY
*((char *) mempcpy (charset, charsetstr, len)) = '\0';
-#else
+# else
memcpy (charset, charsetstr, len);
charset[len] = '\0';
-#endif
+# endif
/* The output charset should normally be determined by the
locale. But sometimes the locale is not used or not correctly
@@ -285,17 +287,18 @@ _nl_load_domain (domain_file)
if (outcharset == NULL || outcharset[0] == '\0')
outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string;
-#ifdef _LIBC
+# ifdef _LIBC
if (__gconv_open (outcharset, charset, &domain->conv,
GCONV_AVOID_NOCONV)
!= __GCONV_OK)
domain->conv = (__gconv_t) -1;
-#else
-# if HAVE_ICONV
+# else
+# if HAVE_ICONV
domain->conv = iconv_open (outcharset, charset);
+# endif
# endif
-#endif
}
+#endif /* _LIBC || HAVE_ICONV */
/* Also look for a plural specification. */
plural = strstr (nullentry, "plural=");