mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-08 17:42:12 +03:00
Update.
2002-10-09 Ulrich Drepper <drepper@redhat.com> * Versions.def (libc): Add GLIBC_2.3.1. (libpthread): Add GLIBC_2.3.1. * include/signal.h: Add libc_hidden_proto for __sigwait, __sigwaitinfo, and __sigtimedwait. * signal/Versions: Add __sigtimedwait, __sigwait, and __sigwaitinfo. * sysdeps/unix/sysv/linux/sigtimedwait.c (__sigtimedwait): Add libc_hidden_def. * sysdeps/unix/sysv/linux/sigwait.c (__sigwait): Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c (__sigwaitinfo): Likewise. * include/sys/msg.h: Declare __libc_msgrcv and __libc_msgsnd. * sysdeps/unix/sysv/linux/msgrcv.c (__msgrcv): Rename to __libc_msgrcv and make old name an alias. * sysdeps/unix/sysv/linux/msgsnd.c (__msgsnd): Rename to __libc_msgsnd and make old name an alias. * sysvipc/Versions (libc) [GLIBC_PRIVATE]: Add __libc_msgrcv and __libc_msgsnd. * include/sys/uio.h: Declare __libc_readv and __libc_writev. * misc/Versions (libc) [GLIBC_PRIVATE]: Add __libc_readv and __libc_writev. * sysdeps/generic/readv.c (__readv): Rename to __libc_readv and make old name an alias. * sysdeps/posix/readv.c: Likewise * sysdeps/unix/sysv/aix/readv.c: Likewise. * sysdeps/unix/sysv/linux/readv.c: Likewise. * sysdeps/generic/writev.c (__writev): Rename to __libc_writev and make old name an alias. * sysdeps/posix/writev.c: Likewise * sysdeps/unix/sysv/aix/writev.c: Likewise. * sysdeps/unix/sysv/linux/writev.c: Likewise. * include/sys/wait.h: Declare __waitid. * posix/Versions (libc) [GLIBC_PRIVATE]: Add __waitid. * sysdeps/generic/waitid.c (waitid): Rename to __waitid and make old name an alias. * sysdeps/posix/waitid.c: Likewise. * sysdeps/unix/sysv/aix/waitid.c: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add creat syscall. 2002-10-07 Jakub Jelinek <jakub@redhat.com> * include/alloca.h (__libc_use_alloca, __libc_alloca_cutoff): New prototypes. (__MAX_ALLOCA_CUTOFF): Define. Include allocalim.h. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r, _nss_dns_gethostbyaddr_r): Use alloca or malloc to allocate host_buffer depending on __libc_use_alloca. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r, _nss_dns_getnetbyaddr_r): Use alloca or malloc to allocate net_buffer depending on __libc_use_alloca. * resolv/res_query.c (res_nquery): Use alloca or malloc to allocate buf depending on __libc_use_alloca. * resolv/gethnamaddr.c (gethostbyname2, gethostbyaddr): Likewise. * stdio-common/vfprintf.c (vfprintf): Use __libc_use_alloca instead of hardcoded constants. Pass proper size argument to alloca and compute end for wide char version. * stdio-common/printf_fp.c (__printf_fp): Use __libc_use_alloca instead of hardcoded constants. * string/strcoll.c (strcoll): Likewise. * string/strxfrm.c (strxfrm): Likewise. * sysdeps/posix/readv.c (__readv): Likewise. * sysdeps/posix/writev.c (__writev): Likewise. * sysdeps/generic/allocalim.h: New file.
This commit is contained in:
@@ -132,12 +132,13 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
|
||||
char *buffer, size_t buflen, int *errnop,
|
||||
int *h_errnop)
|
||||
{
|
||||
querybuf host_buffer;
|
||||
querybuf *host_buffer;
|
||||
char tmp[NS_MAXDNAME];
|
||||
int size, type, n;
|
||||
const char *cp;
|
||||
int map = 0;
|
||||
int map = 0, use_malloc = 0;
|
||||
int olderr = errno;
|
||||
enum nss_status status;
|
||||
|
||||
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
|
||||
return NSS_STATUS_UNAVAIL;
|
||||
@@ -169,8 +170,21 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
|
||||
&& (cp = res_hostalias (&_res, name, tmp, sizeof (tmp))) != NULL)
|
||||
name = cp;
|
||||
|
||||
n = res_nsearch (&_res, name, C_IN, type, host_buffer.buf,
|
||||
sizeof (host_buffer.buf));
|
||||
if (!__libc_use_alloca (MAXPACKET))
|
||||
{
|
||||
host_buffer = (querybuf *) malloc (sizeof (querybuf));
|
||||
if (host_buffer == NULL)
|
||||
{
|
||||
*errnop = ENOMEM;
|
||||
return NSS_STATUS_UNAVAIL;
|
||||
}
|
||||
use_malloc = 1;
|
||||
}
|
||||
else
|
||||
host_buffer = (querybuf *) alloca (sizeof (querybuf));
|
||||
|
||||
n = res_nsearch (&_res, name, C_IN, type, host_buffer->buf,
|
||||
sizeof (host_buffer->buf));
|
||||
if (n < 0)
|
||||
{
|
||||
enum nss_status status = (errno == ECONNREFUSED
|
||||
@@ -185,11 +199,15 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
|
||||
by having the RES_USE_INET6 bit in _res.options set, we try
|
||||
another lookup. */
|
||||
if (af == AF_INET6 && (_res.options & RES_USE_INET6))
|
||||
n = res_nsearch (&_res, name, C_IN, T_A, host_buffer.buf,
|
||||
sizeof (host_buffer.buf));
|
||||
n = res_nsearch (&_res, name, C_IN, T_A, host_buffer->buf,
|
||||
sizeof (host_buffer->buf));
|
||||
|
||||
if (n < 0)
|
||||
return status;
|
||||
{
|
||||
if (use_malloc)
|
||||
free (host_buffer);
|
||||
return status;
|
||||
}
|
||||
|
||||
map = 1;
|
||||
|
||||
@@ -197,8 +215,11 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
|
||||
result->h_length = INADDRSZ;;
|
||||
}
|
||||
|
||||
return getanswer_r (&host_buffer, n, name, type, result, buffer, buflen,
|
||||
errnop, h_errnop, map);
|
||||
status = getanswer_r (host_buffer, n, name, type, result, buffer, buflen,
|
||||
errnop, h_errnop, map);
|
||||
if (use_malloc)
|
||||
free (host_buffer);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
@@ -236,10 +257,10 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
|
||||
char *h_addr_ptrs[MAX_NR_ADDRS + 1];
|
||||
char linebuffer[0];
|
||||
} *host_data = (struct host_data *) buffer;
|
||||
querybuf host_buffer;
|
||||
querybuf *host_buffer;
|
||||
char qbuf[MAXDNAME+1], *qp = NULL;
|
||||
size_t size;
|
||||
int n, status;
|
||||
int n, status, use_malloc = 0;
|
||||
int olderr = errno;
|
||||
|
||||
if ((_res.options & RES_INIT) == 0 && __res_ninit (&_res) == -1)
|
||||
@@ -294,23 +315,40 @@ _nss_dns_gethostbyaddr_r (const void *addr, socklen_t len, int af,
|
||||
break;
|
||||
}
|
||||
|
||||
n = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
|
||||
sizeof host_buffer);
|
||||
if (!__libc_use_alloca (MAXPACKET))
|
||||
{
|
||||
host_buffer = (querybuf *) malloc (sizeof (querybuf));
|
||||
if (host_buffer == NULL)
|
||||
{
|
||||
*errnop = ENOMEM;
|
||||
return NSS_STATUS_UNAVAIL;
|
||||
}
|
||||
use_malloc = 1;
|
||||
}
|
||||
else
|
||||
host_buffer = (querybuf *) alloca (sizeof (querybuf));
|
||||
|
||||
n = res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf,
|
||||
sizeof (host_buffer->buf));
|
||||
if (n < 0 && af == AF_INET6)
|
||||
{
|
||||
strcpy (qp, "ip6.int");
|
||||
n = res_nquery (&_res, qbuf, C_IN, T_PTR, (u_char *)host_buffer.buf,
|
||||
sizeof host_buffer);
|
||||
n = res_nquery (&_res, qbuf, C_IN, T_PTR, host_buffer->buf,
|
||||
sizeof (host_buffer->buf));
|
||||
}
|
||||
if (n < 0)
|
||||
{
|
||||
*h_errnop = h_errno;
|
||||
__set_errno (olderr);
|
||||
if (use_malloc)
|
||||
free (host_buffer);
|
||||
return errno == ECONNREFUSED ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND;
|
||||
}
|
||||
|
||||
status = getanswer_r (&host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
|
||||
status = getanswer_r (host_buffer, n, qbuf, T_PTR, result, buffer, buflen,
|
||||
errnop, h_errnop, 0 /* XXX */);
|
||||
if (use_malloc)
|
||||
free (host_buffer);
|
||||
if (status != NSS_STATUS_SUCCESS)
|
||||
{
|
||||
*h_errnop = h_errno;
|
||||
|
Reference in New Issue
Block a user