mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-18 02:50:09 +00: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.
165 lines
4.4 KiB
C
165 lines
4.4 KiB
C
/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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. */
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
#include <bits/libc-lock.h>
|
|
#include <stdlib.h>
|
|
#include <resolv.h>
|
|
|
|
#include "nsswitch.h"
|
|
|
|
/*******************************************************************\
|
|
|* Here we assume several symbols to be defined: *|
|
|
|* *|
|
|
|* LOOKUP_TYPE - the return type of the function *|
|
|
|* *|
|
|
|* FUNCTION_NAME - name of the non-reentrant function *|
|
|
|* *|
|
|
|* DATABASE_NAME - name of the database the function accesses *|
|
|
|* (e.g., host, services, ...) *|
|
|
|* *|
|
|
|* ADD_PARAMS - additional parameter, can vary in number *|
|
|
|* *|
|
|
|* ADD_VARIABLES - names of additional parameter *|
|
|
|* *|
|
|
|* BUFLEN - length of buffer allocated for the non *|
|
|
|* reentrant version *|
|
|
|* *|
|
|
|* Optionally the following vars can be defined: *|
|
|
|* *|
|
|
|* NEED_H_ERRNO - an extra parameter will be passed to point to *|
|
|
|* the global `h_errno' variable. *|
|
|
|* *|
|
|
\*******************************************************************/
|
|
|
|
/* To make the real sources a bit prettier. */
|
|
#define REENTRANT_NAME APPEND_R (FUNCTION_NAME)
|
|
#define APPEND_R(name) APPEND_R1 (name)
|
|
#define APPEND_R1(name) name##_r
|
|
#define INTERNAL(name) INTERNAL1 (name)
|
|
#define INTERNAL1(name) __##name
|
|
|
|
/* Sometimes we need to store error codes in the `h_errno' variable. */
|
|
#ifdef NEED_H_ERRNO
|
|
# define H_ERRNO_PARM , int *h_errnop
|
|
# define H_ERRNO_VAR , &h_errno_tmp
|
|
# define H_ERRNO_VAR_P &h_errno_tmp
|
|
#else
|
|
# define H_ERRNO_PARM
|
|
# define H_ERRNO_VAR
|
|
# define H_ERRNO_VAR_P NULL
|
|
#endif
|
|
|
|
#ifndef HAVE_TYPE
|
|
# define TYPE_VAR_P NULL
|
|
# define FLAGS_VAR 0
|
|
#endif
|
|
|
|
#ifdef HAVE_AF
|
|
# define AF_VAR_P &af
|
|
#else
|
|
# define AF_VAR_P NULL
|
|
#endif
|
|
|
|
/* Prototype for reentrant version we use here. */
|
|
extern int INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf,
|
|
char *buffer, size_t buflen,
|
|
LOOKUP_TYPE **result H_ERRNO_PARM);
|
|
|
|
/* We need to protect the dynamic buffer handling. */
|
|
__libc_lock_define_initialized (static, lock);
|
|
|
|
/* This points to the static buffer used. */
|
|
libc_freeres_ptr (static char *buffer);
|
|
|
|
|
|
LOOKUP_TYPE *
|
|
FUNCTION_NAME (ADD_PARAMS)
|
|
{
|
|
static size_t buffer_size;
|
|
static LOOKUP_TYPE resbuf;
|
|
LOOKUP_TYPE *result;
|
|
int save;
|
|
#ifdef NEED_H_ERRNO
|
|
int h_errno_tmp = 0;
|
|
#endif
|
|
|
|
/* Get lock. */
|
|
__libc_lock_lock (lock);
|
|
|
|
if (buffer == NULL)
|
|
{
|
|
buffer_size = BUFLEN;
|
|
buffer = malloc (buffer_size);
|
|
}
|
|
|
|
#ifdef HANDLE_DIGITS_DOTS
|
|
if (buffer != NULL)
|
|
{
|
|
if (__nss_hostname_digits_dots (name, &resbuf, &buffer,
|
|
&buffer_size,
|
|
0, &result, NULL, TYPE_VAR_P,
|
|
FLAGS_VAR, AF_VAR_P,
|
|
H_ERRNO_VAR_P))
|
|
goto done;
|
|
}
|
|
#endif
|
|
|
|
while (buffer != NULL
|
|
&& (INTERNAL (REENTRANT_NAME) (ADD_VARIABLES, &resbuf, buffer,
|
|
buffer_size, &result H_ERRNO_VAR)
|
|
== ERANGE)
|
|
#ifdef NEED_H_ERRNO
|
|
&& h_errno_tmp == NETDB_INTERNAL
|
|
#endif
|
|
)
|
|
{
|
|
char *new_buf;
|
|
buffer_size += BUFLEN;
|
|
new_buf = realloc (buffer, buffer_size);
|
|
if (new_buf == NULL)
|
|
{
|
|
/* We are out of memory. Free the current buffer so that the
|
|
process gets a chance for a normal termination. */
|
|
save = errno;
|
|
free (buffer);
|
|
__set_errno (save);
|
|
}
|
|
buffer = new_buf;
|
|
}
|
|
|
|
if (buffer == NULL)
|
|
result = NULL;
|
|
|
|
#ifdef HANDLE_DIGITS_DOTS
|
|
done:
|
|
#endif
|
|
/* Release lock. Preserve error value. */
|
|
save = errno;
|
|
__libc_lock_unlock (lock);
|
|
__set_errno (save);
|
|
|
|
#ifdef NEED_H_ERRNO
|
|
if (h_errno_tmp != 0)
|
|
__set_h_errno (h_errno_tmp);
|
|
#endif
|
|
|
|
return result;
|
|
}
|