mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 18:40:14 +00:00
0501d60367
1997-05-24 03:51 Ulrich Drepper <drepper@cygnus.com> * stdlib/Makefile (routines): Add strtol_l, strtoul_l, strtoll_l, strtoull_l, strtof_l, strtod_l, and strtold_l. * stdlib/stdlib.h: Add prototypes for new functions. * stdlib/strtod.c: Change for compiling as strtoX_l. * stdlib/strtol.c: Likewise. * stdlib/strtof.c: Likewise. * stdlib/strtold.c: Likewise. * stdlib/strtod_l.c: New file. * stdlib/strtof_l.c: New file. * stdlib/strtold_l.c: New file. * stdlib/strtol_l.c: New file. * stdlib/strtoul_l.c: New file. * stdlib/strtoll_l.c: New file. * stdlib/strtoull_l.c: New file. * string/Makefile (routines): Add strcasecmp_l and strncase_l. * string/string.h: Add prototypes for new functions. * sysdeps/generic/strcasecmp.c: Change for compiling as strcasecmp_l. * sysdeps/generic/strncase.c: Change for compiling as strncasecmp_l. * sysdeps/generic/strcasecmp_l.c: New file. * sysdeps/generic/strncase_l.c: New file. * wcsmbs/Makefile (routines): Add wcstol_l, wcstoul_l, wcstoll_l, wcstoull_l, wcstod_l, wcstold_l, wcstof_l, wcscasecmp_l, and wcsncase_l. * wcsmbs/wchar.h: Add prototypes for new functions. * wcsmbs/wcscasecmp.c: Change for compiling as wcscasecmp_l. * wcsmbs/wcsncase.c: Change for compiling as wcsncasecmp_l. * wcsmbs/wcscasecmp_l.c: New file. * wcsmbs/wcsncase_l.c: New file. * wcsmbs/wcstof.c: Change for compiling as wcstof_l.c * wcsmbs/wcstold.c: Change for compiling as wcstold_l.c * wcsmcs/wcstod_l.c: New file. * wcsmcs/wcstof_l.c: New file. * wcsmcs/wcstold_l.c: New file. * wcsmcs/wcstol_l.c: New file. * wcsmcs/wcstoul_l.c: New file. * wcsmcs/wcstoll_l.c: New file. * wcsmcs/wcstoull_l.c: New file. * Makeconfig (binfmt-subdir): New variable. Set to `elf' if $(elf) is defined. More to come later when other binary formats are supported. * Makefile (subdirs): Remove elf. Add $(binfmt-subdir). Suggested by Philip Blundell. * stdlib/Makefile (headers): Add fmtmsg.h. (routines): Add fmtmsg. * stdlib/fmtmsg.c: New file. * stdlib/fmtmsg.h: New file. * manual/stdio.texi: Add description of fmtmsg and addseverity. * manual/examples/fmtmsgexpl.c: Example program for fmtmsg documentation. 1997-05-23 15:26 Philip Blundell <pjb27@cam.ac.uk> * resolv/res_query.c (res_querydomain): Avoid potential buffer overrun. Reported by Dan A. Dickey <ddickey@transition.com>. 1997-05-22 18:36 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * elf/dl-support.c (_dl_sysdep_open_zero_fill, _dl_sysdep_read_whole_file): Moved functions to ... * elf/dl-misc.c: This new file. * sysdeps/generic/dl-sysdepio.c: Delete file and move functions... * elf/dl-misc.c: ... here. * sysdeps/generic/dl-sysdep.c (_dl_sysdep_open_zero_fill, _dl_sysdep_read_whole_file): Delete functions; they now come from elf/dl-misc.c (dl-support.c had contained identical versions). * sysdeps/mach/hurd/dl-sysdepio.c: Delete file; move functions... * sysdeps/mach/hurd/dl-sysdep.c: ... here, but mark them weak so that the regular ones in dl-misc work once we've initialized. * elf/Makefile (dl-routines): Remove dl-sysdepio.c. Add dl-misc.c. 1997-05-22 21:55 Philip Blundell <pjb27@cam.ac.uk> * inet/Makefile (headers): Add netinet/inbits.h. * inet/netinet/in.h: New file. * sysdeps/generic/netinet/inbits.h: Likewise. * sysdeps/unix/sysv/linux/netinet/inbits.h: Likewise. * sysdeps/generic/netinet/ip6.h: Move to... * inet/netinet/ip6.h: ... here. * sysdeps/generic/netinet/icmp6.h: Move to... * inet/netinet/icmp6.h: ... here. * sysdeps/unix/sysv/linux/netinet/in.h: Remove. * sysdeps/generic/netinet/in.h: Remove. 1997-05-22 05:40 Richard Henderson <rth@tamu.edu> * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): If we are not looking at the new thread-safe .plt, don't be lazy about relocs. (_dl_runtime_resolve): Fix up arithmetic for new .plt layout. (elf_alpha_fix_plt): Insert wmb as appropriate to ensure safety. * elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Let elf_machine_runtime_setup() decide if we can actually be lazy. * elf/rtld.c (_dl_start): So don't call it. * elf/dl-reloc.c (_dl_relocate_object): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_runtime_setup): Return lazy. * sysdeps/m68k/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/sparc/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/stub/dl-machine.h (elf_machine_runtime_setup): Update skeleton definition. 1997-05-22 18:45 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu/__math.h (logb): Remove second value placed on stack by fxtract. 1997-05-22 13:07 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sunrpc/rpcsvc/rusers.x: Provide and correct prototypes, add cast to (xdrproc_t) where necessary to prevent warnings. 1997-05-22 12:18 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/powerpc/dl-sysdep.c: Remove I/O functions. * sunrpc/rpcinfo.c (get_inet_address): Use INADDR_NONE and INADDR_ANY * sysdeps/libm-ieee754/s_cexp.c: Fix typo: string_alias -> * nss/XXX-lookup.c: Add missing explanation.
394 lines
11 KiB
C
394 lines
11 KiB
C
/*
|
|
* ++Copyright++ 1988, 1993
|
|
* -
|
|
* Copyright (c) 1988, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
* -
|
|
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies, and that
|
|
* the name of Digital Equipment Corporation not be used in advertising or
|
|
* publicity pertaining to distribution of the document or software without
|
|
* specific, written prior permission.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
|
|
* WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
|
|
* CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
|
|
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
|
|
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
|
|
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
* SOFTWARE.
|
|
* -
|
|
* --Copyright--
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/param.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <arpa/nameser.h>
|
|
|
|
#include <stdio.h>
|
|
#include <netdb.h>
|
|
#include <resolv.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#if defined(BSD) && (BSD >= 199306)
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
#else
|
|
# include "../conf/portability.h"
|
|
#endif
|
|
|
|
#if defined(USE_OPTIONS_H)
|
|
# include <../conf/options.h>
|
|
#endif
|
|
|
|
#if PACKETSZ > 1024
|
|
#define MAXPACKET PACKETSZ
|
|
#else
|
|
#define MAXPACKET 1024
|
|
#endif
|
|
|
|
const char *hostalias __P((const char *));
|
|
|
|
|
|
/*
|
|
* Formulate a normal query, send, and await answer.
|
|
* Returned answer is placed in supplied buffer "answer".
|
|
* Perform preliminary check of answer, returning success only
|
|
* if no error is indicated and the answer count is nonzero.
|
|
* Return the size of the response on success, -1 on error.
|
|
* Error number is left in h_errno.
|
|
*
|
|
* Caller must parse answer and determine whether it answers the question.
|
|
*/
|
|
int
|
|
res_query(name, class, type, answer, anslen)
|
|
const char *name; /* domain name */
|
|
int class, type; /* class and type of query */
|
|
u_char *answer; /* buffer to put answer */
|
|
int anslen; /* size of answer buffer */
|
|
{
|
|
u_char buf[MAXPACKET];
|
|
register HEADER *hp = (HEADER *) answer;
|
|
int n;
|
|
|
|
hp->rcode = NOERROR; /* default */
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
__set_h_errno (NETDB_INTERNAL);
|
|
return (-1);
|
|
}
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_query(%s, %d, %d)\n", name, class, type);
|
|
#endif
|
|
|
|
n = res_mkquery(QUERY, name, class, type, NULL, 0, NULL,
|
|
buf, sizeof(buf));
|
|
if (n <= 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_query: mkquery failed\n");
|
|
#endif
|
|
__set_h_errno (NO_RECOVERY);
|
|
return (n);
|
|
}
|
|
n = res_send(buf, n, answer, anslen);
|
|
if (n < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_query: send error\n");
|
|
#endif
|
|
__set_h_errno (TRY_AGAIN);
|
|
return (n);
|
|
}
|
|
|
|
if (hp->rcode != NOERROR || ntohs(hp->ancount) == 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; rcode = %d, ancount=%d\n", hp->rcode,
|
|
ntohs(hp->ancount));
|
|
#endif
|
|
switch (hp->rcode) {
|
|
case NXDOMAIN:
|
|
__set_h_errno (HOST_NOT_FOUND);
|
|
break;
|
|
case SERVFAIL:
|
|
__set_h_errno (TRY_AGAIN);
|
|
break;
|
|
case NOERROR:
|
|
__set_h_errno (NO_DATA);
|
|
break;
|
|
case FORMERR:
|
|
case NOTIMP:
|
|
case REFUSED:
|
|
default:
|
|
__set_h_errno (NO_RECOVERY);
|
|
break;
|
|
}
|
|
return (-1);
|
|
}
|
|
return (n);
|
|
}
|
|
|
|
/*
|
|
* Formulate a normal query, send, and retrieve answer in supplied buffer.
|
|
* Return the size of the response on success, -1 on error.
|
|
* If enabled, implement search rules until answer or unrecoverable failure
|
|
* is detected. Error code, if any, is left in h_errno.
|
|
*/
|
|
int
|
|
res_search(name, class, type, answer, anslen)
|
|
const char *name; /* domain name */
|
|
int class, type; /* class and type of query */
|
|
u_char *answer; /* buffer to put answer */
|
|
int anslen; /* size of answer */
|
|
{
|
|
register const char *cp, * const *domain;
|
|
HEADER *hp = (HEADER *) answer;
|
|
u_int dots;
|
|
int trailing_dot, ret, saved_herrno;
|
|
int got_nodata = 0, got_servfail = 0, tried_as_is = 0;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
__set_h_errno (NETDB_INTERNAL);
|
|
return (-1);
|
|
}
|
|
__set_errno (0);
|
|
__set_h_errno (HOST_NOT_FOUND); /* default, if we never query */
|
|
dots = 0;
|
|
for (cp = name; *cp; cp++)
|
|
dots += (*cp == '.');
|
|
trailing_dot = 0;
|
|
if (cp > name && *--cp == '.')
|
|
trailing_dot++;
|
|
|
|
/*
|
|
* if there aren't any dots, it could be a user-level alias
|
|
*/
|
|
if (!dots && (cp = __hostalias(name)) != NULL)
|
|
return (res_query(cp, class, type, answer, anslen));
|
|
|
|
/*
|
|
* If there are dots in the name already, let's just give it a try
|
|
* 'as is'. The threshold can be set with the "ndots" option.
|
|
*/
|
|
saved_herrno = -1;
|
|
if (dots >= _res.ndots) {
|
|
ret = res_querydomain(name, NULL, class, type, answer, anslen);
|
|
if (ret > 0)
|
|
return (ret);
|
|
saved_herrno = h_errno;
|
|
tried_as_is++;
|
|
}
|
|
|
|
/*
|
|
* We do at least one level of search if
|
|
* - there is no dot and RES_DEFNAME is set, or
|
|
* - there is at least one dot, there is no trailing dot,
|
|
* and RES_DNSRCH is set.
|
|
*/
|
|
if ((!dots && (_res.options & RES_DEFNAMES)) ||
|
|
(dots && !trailing_dot && (_res.options & RES_DNSRCH))) {
|
|
int done = 0;
|
|
|
|
for (domain = (const char * const *)_res.dnsrch;
|
|
*domain && !done;
|
|
domain++) {
|
|
|
|
ret = res_querydomain(name, *domain, class, type,
|
|
answer, anslen);
|
|
if (ret > 0)
|
|
return (ret);
|
|
|
|
/*
|
|
* If no server present, give up.
|
|
* If name isn't found in this domain,
|
|
* keep trying higher domains in the search list
|
|
* (if that's enabled).
|
|
* On a NO_DATA error, keep trying, otherwise
|
|
* a wildcard entry of another type could keep us
|
|
* from finding this entry higher in the domain.
|
|
* If we get some other error (negative answer or
|
|
* server failure), then stop searching up,
|
|
* but try the input name below in case it's
|
|
* fully-qualified.
|
|
*/
|
|
if (errno == ECONNREFUSED) {
|
|
__set_h_errno (TRY_AGAIN);
|
|
return (-1);
|
|
}
|
|
|
|
switch (h_errno) {
|
|
case NO_DATA:
|
|
got_nodata++;
|
|
/* FALLTHROUGH */
|
|
case HOST_NOT_FOUND:
|
|
/* keep trying */
|
|
break;
|
|
case TRY_AGAIN:
|
|
if (hp->rcode == SERVFAIL) {
|
|
/* try next search element, if any */
|
|
got_servfail++;
|
|
break;
|
|
}
|
|
/* FALLTHROUGH */
|
|
default:
|
|
/* anything else implies that we're done */
|
|
done++;
|
|
}
|
|
|
|
/* if we got here for some reason other than DNSRCH,
|
|
* we only wanted one iteration of the loop, so stop.
|
|
*/
|
|
if (!(_res.options & RES_DNSRCH))
|
|
done++;
|
|
}
|
|
}
|
|
|
|
/* if we have not already tried the name "as is", do that now.
|
|
* note that we do this regardless of how many dots were in the
|
|
* name or whether it ends with a dot.
|
|
*/
|
|
if (!tried_as_is) {
|
|
ret = res_querydomain(name, NULL, class, type, answer, anslen);
|
|
if (ret > 0)
|
|
return (ret);
|
|
}
|
|
|
|
/* if we got here, we didn't satisfy the search.
|
|
* if we did an initial full query, return that query's h_errno
|
|
* (note that we wouldn't be here if that query had succeeded).
|
|
* else if we ever got a nodata, send that back as the reason.
|
|
* else send back meaningless h_errno, that being the one from
|
|
* the last DNSRCH we did.
|
|
*/
|
|
if (saved_herrno != -1)
|
|
__set_h_errno (saved_herrno);
|
|
else if (got_nodata)
|
|
__set_h_errno (NO_DATA);
|
|
else if (got_servfail)
|
|
__set_h_errno (TRY_AGAIN);
|
|
return (-1);
|
|
}
|
|
|
|
/*
|
|
* Perform a call on res_query on the concatenation of name and domain,
|
|
* removing a trailing dot from name if domain is NULL.
|
|
*/
|
|
int
|
|
res_querydomain(name, domain, class, type, answer, anslen)
|
|
const char *name, *domain;
|
|
int class, type; /* class and type of query */
|
|
u_char *answer; /* buffer to put answer */
|
|
int anslen; /* size of answer */
|
|
{
|
|
char nbuf[MAXDNAME * 2 + 2];
|
|
const char *longname = nbuf;
|
|
int n;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
__set_h_errno (NETDB_INTERNAL);
|
|
return (-1);
|
|
}
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf(";; res_querydomain(%s, %s, %d, %d)\n",
|
|
name, domain?domain:"<Nil>", class, type);
|
|
#endif
|
|
if (domain == NULL) {
|
|
/*
|
|
* Check for trailing '.';
|
|
* copy without '.' if present.
|
|
*/
|
|
n = strlen(name) - 1;
|
|
if (n != (0 - 1) && name[n] == '.'
|
|
&& n < (int) (sizeof(nbuf) - 1)) {
|
|
bcopy(name, nbuf, n);
|
|
nbuf[n] = '\0';
|
|
} else
|
|
longname = name;
|
|
} else
|
|
sprintf(nbuf, "%.*s.%.*s", MAXDNAME, name, MAXDNAME, domain);
|
|
|
|
return (res_query(longname, class, type, answer, anslen));
|
|
}
|
|
|
|
const char *
|
|
hostalias(name)
|
|
register const char *name;
|
|
{
|
|
register char *cp1, *cp2;
|
|
FILE *fp;
|
|
char *file;
|
|
char buf[BUFSIZ];
|
|
static char abuf[MAXDNAME];
|
|
|
|
if (_res.options & RES_NOALIASES)
|
|
return (NULL);
|
|
file = __secure_getenv("HOSTALIASES");
|
|
if (file == NULL || (fp = fopen(file, "r")) == NULL)
|
|
return (NULL);
|
|
setbuf(fp, NULL);
|
|
buf[sizeof(buf) - 1] = '\0';
|
|
while (fgets(buf, sizeof(buf), fp)) {
|
|
for (cp1 = buf; *cp1 && !isspace(*cp1); ++cp1)
|
|
;
|
|
if (!*cp1)
|
|
break;
|
|
*cp1 = '\0';
|
|
if (!strcasecmp(buf, name)) {
|
|
while (isspace(*++cp1))
|
|
;
|
|
if (!*cp1)
|
|
break;
|
|
for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2)
|
|
;
|
|
abuf[sizeof(abuf) - 1] = *cp2 = '\0';
|
|
strncpy(abuf, cp1, sizeof(abuf) - 1);
|
|
fclose(fp);
|
|
return (abuf);
|
|
}
|
|
}
|
|
fclose(fp);
|
|
return (NULL);
|
|
}
|