aboutsummaryrefslogtreecommitdiff
path: root/intl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-05-07 21:23:56 +0000
committerUlrich Drepper <drepper@redhat.com>2000-05-07 21:23:56 +0000
commit45eca4d141c047950db48c69c8941163d0a61fcd (patch)
tree66035482a9beed5f14699227294ac902b32a5106 /intl
parentd89d0afad4551a808b15510795f965aed147a834 (diff)
downloadglibc-45eca4d141c047950db48c69c8941163d0a61fcd.zip
glibc-45eca4d141c047950db48c69c8941163d0a61fcd.tar.gz
glibc-45eca4d141c047950db48c69c8941163d0a61fcd.tar.bz2
Update.
2000-05-06 Bruno Haible <haible@clisp.cons.org> * iconv/gconv_open.c (__gconv_open): If __gconv_find_transform returned != __GCONV_OK, there is nothing to clean up. 2000-05-06 Bruno Haible <haible@clisp.cons.org> * intl/tst-gettext.c (main): Disable possibly existing LC_CTYPE and OUTPUT_CHARSET environment variables. 2000-05-06 Andreas Jaeger <aj@suse.de> * sysdeps/generic/dl-cache.h (struct file_entry_new): New. (struct cache_file_new): New. (struct file_entry): New (moved from cache.c). (struct cache_file): New (moved from cache.c). * sysdeps/generic/dl-cache.c (SEARCH_CACHE): New macro, broken out from _dl_load_cache_lookup. (_dl_load_cache_lookup): Move search to SEARCH_CACHE macro, handle the different cache formats. New variable cache_new for new format. * elf/ldconfig.h: Change according to changes in cache.c and ldconfig.c; remove cache_libcmp; add opt_format. * elf/ldconfig.c: Include "dl-cache.h" and "dl-procinfo.h"; remove stuff that's defined in those headers. Add hwcap to struct lib_entry. (opt_format): New variable to select cache format. (options): Add format parameter. (is_hwcap): New function. (path_hwcap): New function. (parse_opt): Handle new format parameter. (search_dir): Handle hwcap, search also subdirectories with hwcap. * elf/cache.c (_GNU_SOURCE): Removed. Not needed anymore since ldconfig is part of glibc. Include dl-cache.h and remove stuff that's defined there. (struct cache_entry): Add new member hwcap. (print_entry): Print hwcap, cleanup a bit. (print_cache): Print new and old formats. (compare): Use _dl_cache_libcmp from dl-cache.h; handle hwcap. (save_cache): Save new and old formats. (add_to_cache): Handle hwcap. * sysdeps/generic/dl-cache.c (_dl_cache_libcmp): Moved from here... * sysdeps/generic/dl-cache.h (_dl_cache_libcmp): ...to here. * sysdeps/generic/dl-cache.c (LD_SO_CACHE): Moved from here... * sysdeps/generic/dl-cache.h (LD_SO_CACHE): ...to here. * sysdeps/generic/dl-cache.c (CACHEMAGIC): Moved from here... * sysdeps/generic/dl-cache.h (CACHEMAGIC): ...to here. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (alignof): New macro. (_nl_find_msg): Use it instead of __alignof__. Pass correct output buffer length to __gconv/iconv. If malloc (freemem_size) fails, set freemem_size to 0. 2000-05-05 Bruno Haible <haible@clisp.cons.org> * intl/dcigettext.c (dcigettext): Fix interpretation of tsearch return value.
Diffstat (limited to 'intl')
-rw-r--r--intl/dcigettext.c36
-rw-r--r--intl/tst-gettext.c2
2 files changed, 29 insertions, 9 deletions
diff --git a/intl/dcigettext.c b/intl/dcigettext.c
index 3c86b83..b52fbd5 100644
--- a/intl/dcigettext.c
+++ b/intl/dcigettext.c
@@ -110,6 +110,14 @@ void free ();
# define __libc_rwlock_unlock(NAME)
#endif
+/* Alignment of types. */
+#if defined __GNUC__ && __GNUC__ >= 2
+# define alignof(TYPE) __alignof__ (TYPE)
+#else
+# define alignof(TYPE) \
+ ((int) &((struct { char dummy1; TYPE dummy2; } *) 0)->dummy2)
+#endif
+
/* @@ end of prolog @@ */
#ifdef _LIBC
@@ -785,20 +793,24 @@ _nl_find_msg (domain_file, msgid, index)
resultlen = p - result;
}
- inbuf = result;
- outbuf = freemem + 4;
-
__libc_lock_lock (lock);
+ inbuf = result;
+ outbuf = freemem + sizeof (nls_uint32);
+
while (1)
{
# ifdef _LIBC
size_t non_reversible;
int res;
+ if (freemem_size < 4)
+ goto resize_freemem;
+
res = __gconv (domain->conv,
&inbuf, inbuf + resultlen,
- &outbuf, outbuf + freemem_size,
+ &outbuf,
+ outbuf + freemem_size - sizeof (nls_uint32),
&non_reversible);
if (res == __GCONV_OK || res == __GCONV_EMPTY_INPUT)
@@ -816,8 +828,12 @@ _nl_find_msg (domain_file, msgid, index)
const char *inptr = (const char *) inbuf;
size_t inleft = resultlen;
char *outptr = (char *) outbuf;
- size_t outleft = freemem_size;
+ size_t outleft;
+
+ if (freemem_size < 4)
+ goto resize_freemem;
+ outleft = freemem_size - 4;
if (iconv (domain->conv, &inptr, &inleft, &outptr, &outleft)
!= (size_t) (-1))
{
@@ -832,6 +848,7 @@ _nl_find_msg (domain_file, msgid, index)
# endif
# endif
+ resize_freemem:
/* We must resize the buffer. */
freemem_size = 2 * freemem_size;
if (freemem_size < 4064)
@@ -839,11 +856,12 @@ _nl_find_msg (domain_file, msgid, index)
freemem = (char *) malloc (freemem_size);
if (__builtin_expect (freemem == NULL, 0))
{
+ freemem_size = 0;
__libc_lock_unlock (lock);
goto converted;
}
- outbuf = freemem + 4;
+ outbuf = freemem + sizeof (nls_uint32);
}
/* We have now in our buffer a converted string. Put this
@@ -853,15 +871,15 @@ _nl_find_msg (domain_file, msgid, index)
/* Shrink freemem, but keep it aligned. */
freemem_size -= outbuf - freemem;
freemem = outbuf;
- freemem += freemem_size & (__alignof__ (nls_uint32) - 1);
- freemem_size = freemem_size & ~ (__alignof__ (nls_uint32) - 1);
+ freemem += freemem_size & (alignof (nls_uint32) - 1);
+ freemem_size = freemem_size & ~ (alignof (nls_uint32) - 1);
__libc_lock_unlock (lock);
}
/* Now domain->conv_tab[act] contains the translation of at least
the variants 0 .. INDEX. */
- result = domain->conv_tab[act] + 4;
+ result = domain->conv_tab[act] + sizeof (nls_uint32);
}
converted:
diff --git a/intl/tst-gettext.c b/intl/tst-gettext.c
index 9ce1190..b897d71 100644
--- a/intl/tst-gettext.c
+++ b/intl/tst-gettext.c
@@ -68,7 +68,9 @@ main (int argc, char *argv[])
setenv ("LANGUAGE", "existing-locale", 1);
setenv ("LC_ALL", "non-existing-locale", 1);
setenv ("LC_MESSAGES", "non-existing-locale", 1);
+ setenv ("LC_CTYPE", "non-existing-locale", 1);
setenv ("LANG", "non-existing-locale", 1);
+ unsetenv ("OUTPUT_CHARSET");
/* This is the name of the existing domain with a catalog for the
LC_MESSAGES category. */
textdomain ("existing-domain");