From 17c389fc2b8bdc74ae136c933988ad5d89f6350e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 4 May 2000 02:46:54 +0000 Subject: Update. * libio/stdio.h: Make fseeko and ftello prototypes available is __USE_LARGEFILE. Patch by Paul Eggert . * sysdeps/generic/dl-environ.c (unsetenv): Follow change to the real unsetenv implementation from 1999-07-29 [PR libc/1714]. 2000-05-03 Bruno Haible * intl/dcigettext.c (dcigettext): Do the defaulting of 'domainname' before calling tfind. 2000-03-05 Jakub Jelinek * resolv/resolv.h (res_querydomain): Remove redefinition to __res_querydomain (reported by Owen Taylor ). 2000-05-03 Ulrich Drepper * po/gl.po: Update from translation team. * manual/intro.texi (Program Basics): Change section title. * manual/process.texi: Fix reference. (Executing a File): Add reference exec in other section. * manual/signal.texi: Fix reference. * manual/startup.texi: Document syscall function. Patches by Bryan Henderson . 2000-04-29 Bruno Haible * intl/libintl.h (bind_textdomain_codeset): New declaration. * intl/bindtextdom.c (set_binding_values): New function. (bindtextdomain): Call it. (bind_textdomain_codeset): New function. * intl/dcigettext.c (dcigettext): Pass binding to _nl_find_domain. (free_mem): Free each binding's codeset. * intl/gettextP.h (struct binding): Add codeset field. (_nl_find_domain): Add domainbinding argument. * intl/finddomain.c (_nl_find_domain): Add domainbinding argument. Pass it to _nl_make_l10nflist. * intl/loadinfo.h (struct loaded_l10nfile): Add domainbinding field. (_nl_make_l10nflist): Add domainbinding argument. * intl/l10nflist.c (_nl_make_l10nflist): Add domainbinding argument. * intl/loadmsgcat.c (_nl_load_domain): Look at the domainbinding's codeset when determining outcharset. If !_LIBC && HAVE_ICONV, call locale_charset(). * manual/message.texi: New node "Charset conversion in gettext". 2000-04-30 Bruno Haible * catgets/open_catalog.c (__open_catalog): Use __builtin_expect where appropriate. Handle possible __read error. 2000-04-29 Bruno Haible * intl/gettextP.h (__builtin_expect): Define as empty if not a compiler builtin. * intl/loadinfo.h (__builtin_expect): Likewise. * intl/dcigettext.c (dcigettext, _nl_find_msg): Use __builtin_expect where appropriate. * intl/loadmsgcat.c (_nl_load_domain): Likewise. * intl/localealias.c (extend_alias_table): Return an error indicator. (read_alias_file): Bail out if extend_alias_table fails. 2000-04-29 Bruno Haible * intl/loadmsgcat.c: Define _GNU_SOURCE as early as possible. * intl/localealias.c: Likewise. 2000-05-01 Bruno Haible * intl/loadmsgcat.c (_nl_load_domain): Initialize domain->conv_tab. Initialize domain->plural and domain->nplurals even if there is no nullentry. 2000-05-01 Bruno Haible * intl/dcigettext.c (_nl_find_msg): Terminate __gconv loop if return value is == __GCONV_OK or == __GCONV_EMPTY_INPUT, not != __GCONV_OK. In case of failure, goto converted. 2000-05-01 Bruno Haible * wcsmbs/wcsmbsload.c (norm_add_slashes): Move away. * iconv/gconv_int.h (norm_add_slashes): Move to here. * intl/loadmsgcat.c (_nl_load_domain): Normalize strings passed to __gconv_open. 2000-04-29 Bruno Haible * intl/dcigettext.c (transcmp): Compare the domains as well. (dcigettext): Call strlen (msgid1) after testing msgid1 against NULL, not before. * intl/loadmsgcat.c (_nl_load_domain): Deal with EINTR. Include . 2000-05-03 Ulrich Drepper --- catgets/open_catalog.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'catgets') diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c index c5193e1..4a63a13 100644 --- a/catgets/open_catalog.c +++ b/catgets/open_catalog.c @@ -50,7 +50,7 @@ __open_catalog (__nl_catd catalog) __libc_lock_lock (catalog->lock); /* Check whether there was no other thread faster. */ - if (catalog->status != closed) + if (__builtin_expect (catalog->status != closed, 0)) /* While we waited some other thread tried to open the catalog. */ goto unlock_return; @@ -60,7 +60,7 @@ __open_catalog (__nl_catd catalog) { const char *run_nlspath = catalog->nlspath; #define ENOUGH(n) \ - if (bufact + (n) >=bufmax) \ + if (__builtin_expect (bufact + (n) >= bufmax, 0)) \ { \ char *old_buf = buf; \ bufmax += 256 + (n); \ @@ -251,8 +251,12 @@ __open_catalog (__nl_catd catalog) { size_t now = __read (fd, (((char *) &catalog->file_ptr) + (st.st_size - todo)), todo); - if (now == 0) + if (now == 0 || now == (size_t) -1) { +#ifdef EINTR + if (now == (size_t) -1 && errno == EINTR) + continue; +#endif free ((void *) catalog->file_ptr); catalog->status = nonexisting; goto close_unlock_return; -- cgit v1.1