mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
c877418f2e
New macros. * elf/dl-close.c (free_mem): Use libc_freeres_fn macro, remove text_set_element. * elf/dl-libc.c (free_mem): Likewise. * iconv/gconv_conf.c (free_mem): Likewise. * iconv/gconv_db.c (free_mem): Likewise. * iconv/gconv_dl.c (free_mem): Likewise. * iconv/gconv_cache.c (free_mem): Likewise. * intl/finddomain.c (free_mem): Likewise. * intl/dcigettext.c (free_mem): Likewise. * locale/setlocale.c (free_mem): Likewise. * misc/fstab.c (fstab_free): Likewise. * nss/nsswitch.c (free_mem): Likewise. * posix/regcomp.c (free_mem): Likewise. * resolv/gai_misc.c (free_res): Likewise. * stdlib/fmtmsg.c (free_mem): Likewise. * sunrpc/clnt_perr.c (free_mem): Likewise. * sysdeps/generic/setenv.c (free_mem): Likewise. * sysdeps/unix/sysv/linux/shm_open.c (freeit): Likewise. * sysdeps/pthread/aio_misc.c (free_res): Likewise. * time/tzset.c (free_mem): Likewise. * malloc/mtrace.c (release_libc_mem): Add __libc_freeres_fn_section. * locale/loadarchive.c (_nl_archive_subfreeres): Likewise. * malloc/set-freeres.c (__libc_freeres): Likewise. * login/getutent.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutent): Allocate buffer the first time it is run. * login/getutid.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutid): Allocate buffer the first time it is run. * login/getutline.c: Include stdlib.h instead of stddef.h. (buffer): Change into pointer to utmp, add libc_freeres_ptr. (__getutline): Allocate buffer the first time it is run. * malloc/mtrace.c (malloc_trace_buffer): Change into char *. (mtrace): Allocate malloc_trace_buffer. * resolv/nsap_addr.c (inet_nsap_ntoa): Decrease size of tmpbuf. * resolv/ns_print.c (ns_sprintrrf): Decrease size of t. * string/strerror.c: Include libintl.h and errno.h. (buf): New variable. (strerror): Only allocate buffer if actually needed (unknown error). * time/tzfile.c (transitions): Add libc_freeres_ptr. (freeres): Remove. 2002-10-25 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (libc_freeres_ptr): New macro. * malloc/set-freeres.c (__libc_freeres_ptrs): Define using symbol_set_define. (__libc_freeres): Free all pointers in that section. * Makerules (build-shlib): Add $(LDSEDCMD-$(@F:lib%.so=%).so) to sed commands when creating .lds script. (LDSEDCMD-c.so): New variable. * inet/rcmd.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rcmd_af): Use strdup to allocate ahostbuf. * inet/rexec.c (ahostbuf): Change into char *. Add libc_freeres_ptr. (rexec_af): Use strdup to allocate ahostbuf. * stdio-common/reg-printf.c (printf_funcs): Remove. (__printf_arginfo_table): Change into printf_arginfo_function **. Add libc_freeres_ptr. (__register_printf_function): Allocate __printf_arginfo_table and __printf_function_table the first time it is called. * stdio-common/printf-parse.h (__printf_arginfo_table): Change into printf_arginfo_function **. (parse_one_spec): Add __builtin_expect. * grp/fgetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * inet/getnetgrent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * intl/localealias.c (libc_freeres_ptr): Define if !_LIBC. (string_space, map): Add libc_freeres_ptr. (free_mem): Remove. * misc/efgcvt.c (FCVT_BUFPTR): Add libc_freeres_ptr. (free_mem): Remove. * misc/mntent.c (getmntent_buffer): Add libc_freeres_ptr. (free_mem): Remove. * crypt/md5-crypt.c (libc_freeres_ptr): Define if !_LIBC. (buffer): Add libc_freeres_ptr. (free_mem): Remove for _LIBC. * nss/getXXbyYY.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * nss/getXXent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * pwd/fgetpwent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * resolv/res_hconf.c (ifaddrs): Add libc_freeres_ptr. (free_mem): Remove. * shadow/fgetspent.c (buffer): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/posix/ttyname.c (getttyname_name): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/getsysstats.c (mount_proc): Add libc_freeres_ptr. (free_mem): Remove. * sysdeps/unix/sysv/linux/ttyname.c (getttyname_name, ttyname_buf): Add libc_freeres_ptr. (free_mem): Remove. 2002-10-30 Jakub Jelinek <jakub@redhat.com> * malloc/obstack.c [_LIBC] (obstack_free): Change into strong_alias instead of duplicating the whole function in libc.
186 lines
5.3 KiB
C
186 lines
5.3 KiB
C
/* Handle list of needed message catalogs
|
|
Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Ulrich Drepper <drepper@gnu.org>, 1995.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#include <sys/types.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#if defined HAVE_UNISTD_H || defined _LIBC
|
|
# include <unistd.h>
|
|
#endif
|
|
|
|
#include "gettextP.h"
|
|
#ifdef _LIBC
|
|
# include <libintl.h>
|
|
#else
|
|
# include "libgnuintl.h"
|
|
#endif
|
|
|
|
/* @@ end of prolog @@ */
|
|
/* List of already loaded domains. */
|
|
static struct loaded_l10nfile *_nl_loaded_domains;
|
|
|
|
|
|
/* Return a data structure describing the message catalog described by
|
|
the DOMAINNAME and CATEGORY parameters with respect to the currently
|
|
established bindings. */
|
|
struct loaded_l10nfile *
|
|
internal_function
|
|
_nl_find_domain (dirname, locale, domainname, domainbinding)
|
|
const char *dirname;
|
|
char *locale;
|
|
const char *domainname;
|
|
struct binding *domainbinding;
|
|
{
|
|
struct loaded_l10nfile *retval;
|
|
const char *language;
|
|
const char *modifier;
|
|
const char *territory;
|
|
const char *codeset;
|
|
const char *normalized_codeset;
|
|
const char *alias_value;
|
|
int mask;
|
|
|
|
/* LOCALE can consist of up to four recognized parts for the XPG syntax:
|
|
|
|
language[_territory[.codeset]][@modifier]
|
|
|
|
Beside the first part all of them are allowed to be missing. If
|
|
the full specified locale is not found, the less specific one are
|
|
looked for. The various parts will be stripped off according to
|
|
the following order:
|
|
(1) codeset
|
|
(2) normalized codeset
|
|
(3) territory
|
|
(4) modifier
|
|
*/
|
|
|
|
/* If we have already tested for this locale entry there has to
|
|
be one data set in the list of loaded domains. */
|
|
retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
|
|
strlen (dirname) + 1, 0, locale, NULL, NULL,
|
|
NULL, NULL, domainname, 0);
|
|
if (retval != NULL)
|
|
{
|
|
/* We know something about this locale. */
|
|
int cnt;
|
|
|
|
if (retval->decided == 0)
|
|
_nl_load_domain (retval, domainbinding);
|
|
|
|
if (retval->data != NULL)
|
|
return retval;
|
|
|
|
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (retval->successor[cnt]->decided == 0)
|
|
_nl_load_domain (retval->successor[cnt], domainbinding);
|
|
|
|
if (retval->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
return cnt >= 0 ? retval : NULL;
|
|
/* NOTREACHED */
|
|
}
|
|
|
|
/* See whether the locale value is an alias. If yes its value
|
|
*overwrites* the alias name. No test for the original value is
|
|
done. */
|
|
alias_value = _nl_expand_alias (locale);
|
|
if (alias_value != NULL)
|
|
{
|
|
#if defined _LIBC || defined HAVE_STRDUP
|
|
locale = strdup (alias_value);
|
|
if (locale == NULL)
|
|
return NULL;
|
|
#else
|
|
size_t len = strlen (alias_value) + 1;
|
|
locale = (char *) malloc (len);
|
|
if (locale == NULL)
|
|
return NULL;
|
|
|
|
memcpy (locale, alias_value, len);
|
|
#endif
|
|
}
|
|
|
|
/* Now we determine the single parts of the locale name. First
|
|
look for the language. Termination symbols are `_' and `@' if
|
|
we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */
|
|
mask = _nl_explode_name (locale, &language, &modifier, &territory,
|
|
&codeset, &normalized_codeset);
|
|
|
|
/* Create all possible locale entries which might be interested in
|
|
generalization. */
|
|
retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname,
|
|
strlen (dirname) + 1, mask, language, territory,
|
|
codeset, normalized_codeset, modifier,
|
|
domainname, 1);
|
|
if (retval == NULL)
|
|
/* This means we are out of core. */
|
|
return NULL;
|
|
|
|
if (retval->decided == 0)
|
|
_nl_load_domain (retval, domainbinding);
|
|
if (retval->data == NULL)
|
|
{
|
|
int cnt;
|
|
for (cnt = 0; retval->successor[cnt] != NULL; ++cnt)
|
|
{
|
|
if (retval->successor[cnt]->decided == 0)
|
|
_nl_load_domain (retval->successor[cnt], domainbinding);
|
|
if (retval->successor[cnt]->data != NULL)
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* The room for an alias was dynamically allocated. Free it now. */
|
|
if (alias_value != NULL)
|
|
free (locale);
|
|
|
|
/* The space for normalized_codeset is dynamically allocated. Free it. */
|
|
if (mask & XPG_NORM_CODESET)
|
|
free ((void *) normalized_codeset);
|
|
|
|
return retval;
|
|
}
|
|
|
|
|
|
#ifdef _LIBC
|
|
libc_freeres_fn (free_mem)
|
|
{
|
|
struct loaded_l10nfile *runp = _nl_loaded_domains;
|
|
|
|
while (runp != NULL)
|
|
{
|
|
struct loaded_l10nfile *here = runp;
|
|
if (runp->data != NULL)
|
|
_nl_unload_domain ((struct loaded_domain *) runp->data);
|
|
runp = runp->next;
|
|
free ((char *) here->filename);
|
|
free (here);
|
|
}
|
|
}
|
|
#endif
|