mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-21 10:20:06 +00:00
fa0bc87c32
* stdlib/canonicalize.c: New file. * stdlib/stdlib.h: Declare canonicalize_file_name, realpath. * stdlib/Makefile (routines): Add canonicalize. * posix/unistd.h: Declare __canonicalize_directory_name_internal. Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_seq.c: Prevent `sccsid' definition by using the same #if condition as in the other db files. * intl/Makefile: Add -Wno-unused CFLAGS for compilation of bindtextdom.c, finddomain.c, and localealias.c. * intl/dcgettext.c: Don't define prototype for getcwd() when compiling in glibc. * libio/cleanup.c: Add prototype for _IO_register_cleanup. * libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't define _POSIX_SOURCE unconditionally. * libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if compiling in glibc. * libio/fileops.c (_IO_file_close_it): Don't sync file, call flush instead. This relaxes the rules from POSIX.1 about changing the active handle a bit. * libio/iofopncook.c (struct _IO_cookie_file): Move definition into <libio.h>. Add prototypes for local functions to prevent warnings. * libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and _IO_DUP2 to contain complete parameter list. * libio/libio.h: Add definition of struct _IO_cookie_file. * libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf, and _IO_vsnprintf. * libio/memstream.c: Include <stdio.h>. * libio/stdio.h: Add prototypes for fopencookie, __stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf. * libio/strops.c: Avoid useless expression in `for' initializer. * locale/findlocale.c: Add some casts to prevent warnings. * locale/programs/locfile.c (write_locale_data): Don't use double `/' in locale binary file. * posix/unistd.h: Remove prototype for `reboot'. Update from bind-4.9.4-T1A. * resolv/Makefile (routines): Add inet_ntop and inet_pton. * resolv/arpa/nameser.h: Add definition of IN6ADDRSZ. * resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c, resolv/res_debug.c, resolv/res_init.c * resolv/inet_ntop.c, resolv/inet_pton.c: New files. * resolv/resolv.h: Add RES_USE_INET6 flag. (__dn_isvalid): Renamed to __res_dnok. Add prototypes for __res_ownok and __res_mailok. * stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c. * stdio-common/getline.c, stdio-common/vfscanf.c, sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore. * sysdeps/unix/sysv/linux/Makefile [$subdir == misc] (sysdep_routines): Add s_reboot. (install-others): Add $(includedir)/sys/syscall.h. New rule for $(includedir)/sys/syscall.h to produce from <asm/unistd.h>. * sysdeps/unix/sysv/linux/reboot.c: New file. Make single argument function call 3 argument system call. * sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific definition for reboot function. * sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete comment. * sysdeps/unix/sysv/linux/syscalls.list: Rename function for reboot syscall to __syscall_reboot. * wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by __USE_GNU, not USE_GNU. Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com> * locale/programs/charset.c, locale/programs/ld-collate.c: Add casts to prevent warnings on 64-bit machines. * locale/programs/ld-monetary.c: Don't do unnecessary tests for int_frac_digits and frac_digits which only produce warnings. Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com> * inet/arpa/inet.h: Backup return type of inet_addr to u_long. * resolv/inet_addr.c: Likewise. * resolv/Makefile (distribute): Add res_hconf.h (routines): Add res_hconf. * resolv/gethnamaddr.c: Add support for /etc/host.conf. * resolv/res_init.c: Initialize /etc/host.conf reader. * resolv/res_hconf.c, resolv/res_hconf.h: New files. Implementation of reading /etc/host.conf. Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * Rules (%.out rules): Prepend $($*-ENV) to the command. * sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak alias for __curbrk. Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu> * hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK. * hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK. Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. (__canonicalize_directory_name_internal): New function using it. * sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu> * string/argz-create.c (__argz_create): Correctly calculate length. * string/argz-extract.c (__argz_extract): Add terminating 0 entry. * hurd/hurdstartup.c (_hurd_startup): ... and don't so here. [HAVE_VMSDIR_H]: Include "vmsdir.h". (glob) [VMS]: Don't grok ~.
288 lines
7.8 KiB
C
288 lines
7.8 KiB
C
/* Copyright (c) 1993 Carlos Leandro and Rui Salgueiro
|
|
* Dep. Matematica Universidade de Coimbra, Portugal, Europe
|
|
*
|
|
* 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.
|
|
*/
|
|
/*
|
|
* Copyright (c) 1983, 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
|
|
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
|
|
static char rcsid[] = "$Id$";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/socket.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>
|
|
#include <string.h>
|
|
|
|
extern int h_errno;
|
|
|
|
#if defined(mips) && defined(SYSTYPE_BSD43)
|
|
extern int errno;
|
|
#endif
|
|
|
|
struct netent *_getnetbyaddr __P((long net, int type));
|
|
struct netent *_getnetbyname __P((const char *name));
|
|
|
|
#define BYADDR 0
|
|
#define BYNAME 1
|
|
#define MAXALIASES 35
|
|
|
|
#if PACKETSZ > 1024
|
|
#define MAXPACKET PACKETSZ
|
|
#else
|
|
#define MAXPACKET 1024
|
|
#endif
|
|
|
|
typedef union {
|
|
HEADER hdr;
|
|
u_char buf[MAXPACKET];
|
|
} querybuf;
|
|
|
|
typedef union {
|
|
long al;
|
|
char ac;
|
|
} align;
|
|
|
|
static struct netent *
|
|
getnetanswer(answer, anslen, net_i)
|
|
querybuf *answer;
|
|
int anslen;
|
|
int net_i;
|
|
{
|
|
|
|
register HEADER *hp;
|
|
register u_char *cp;
|
|
register int n;
|
|
u_char *eom;
|
|
int type, class, buflen, ancount, qdcount, haveanswer, i, nchar;
|
|
char aux1[30], aux2[30], ans[30], *in, *st, *pauxt, *bp, **ap,
|
|
*paux1 = &aux1[0], *paux2 = &aux2[0], flag = 0;
|
|
static struct netent net_entry;
|
|
static char *net_aliases[MAXALIASES], netbuf[BUFSIZ+1];
|
|
|
|
/*
|
|
* find first satisfactory answer
|
|
*
|
|
* answer --> +------------+ ( MESSAGE )
|
|
* | Header |
|
|
* +------------+
|
|
* | Question | the question for the name server
|
|
* +------------+
|
|
* | Answer | RRs answering the question
|
|
* +------------+
|
|
* | Authority | RRs pointing toward an authority
|
|
* | Additional | RRs holding additional information
|
|
* +------------+
|
|
*/
|
|
eom = answer->buf + anslen;
|
|
hp = &answer->hdr;
|
|
ancount = ntohs(hp->ancount); /* #/records in the answer section */
|
|
qdcount = ntohs(hp->qdcount); /* #/entries in the question section */
|
|
bp = netbuf;
|
|
buflen = sizeof(netbuf);
|
|
cp = answer->buf + HFIXEDSZ;
|
|
if (!qdcount) {
|
|
if (hp->aa)
|
|
h_errno = HOST_NOT_FOUND;
|
|
else
|
|
h_errno = TRY_AGAIN;
|
|
return (NULL);
|
|
}
|
|
while (qdcount-- > 0)
|
|
cp += __dn_skipname(cp, eom) + QFIXEDSZ;
|
|
ap = net_aliases;
|
|
*ap = NULL;
|
|
net_entry.n_aliases = net_aliases;
|
|
haveanswer = 0;
|
|
while (--ancount >= 0 && cp < eom) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_dnok(bp))
|
|
break;
|
|
cp += n;
|
|
ans[0] = '\0';
|
|
(void)strcpy(&ans[0], bp);
|
|
GETSHORT(type, cp);
|
|
GETSHORT(class, cp);
|
|
cp += INT32SZ; /* TTL */
|
|
GETSHORT(n, cp);
|
|
if (class == C_IN && type == T_PTR) {
|
|
n = dn_expand(answer->buf, eom, cp, bp, buflen);
|
|
if ((n < 0) || !res_hnok(bp)) {
|
|
cp += n;
|
|
return (NULL);
|
|
}
|
|
cp += n;
|
|
*ap++ = bp;
|
|
bp += strlen(bp) + 1;
|
|
net_entry.n_addrtype =
|
|
(class == C_IN) ? AF_INET : AF_UNSPEC;
|
|
haveanswer++;
|
|
}
|
|
}
|
|
if (haveanswer) {
|
|
*ap = NULL;
|
|
switch (net_i) {
|
|
case BYADDR:
|
|
net_entry.n_name = *net_entry.n_aliases;
|
|
net_entry.n_net = 0L;
|
|
break;
|
|
case BYNAME:
|
|
in = *net_entry.n_aliases;
|
|
net_entry.n_name = &ans[0];
|
|
aux2[0] = '\0';
|
|
for (i = 0; i < 4; i++) {
|
|
for (st = in, nchar = 0;
|
|
*st != '.';
|
|
st++, nchar++)
|
|
;
|
|
if (nchar != 1 || *in != '0' || flag) {
|
|
flag = 1;
|
|
(void)strncpy(paux1,
|
|
(i==0) ? in : in-1,
|
|
(i==0) ?nchar : nchar+1);
|
|
paux1[(i==0) ? nchar : nchar+1] = '\0';
|
|
pauxt = paux2;
|
|
paux2 = strcat(paux1, paux2);
|
|
paux1 = pauxt;
|
|
}
|
|
in = ++st;
|
|
}
|
|
net_entry.n_net = inet_network(paux2);
|
|
break;
|
|
}
|
|
net_entry.n_aliases++;
|
|
return (&net_entry);
|
|
}
|
|
h_errno = TRY_AGAIN;
|
|
return (NULL);
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyaddr(net, net_type)
|
|
register u_long net;
|
|
register int net_type;
|
|
{
|
|
unsigned int netbr[4];
|
|
int nn, anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
u_int32_t net2; /* Changed from unsigned long --roland */
|
|
struct netent *net_entry;
|
|
|
|
if (net_type != AF_INET)
|
|
return (_getnetbyaddr(net, net_type));
|
|
|
|
for (nn = 4, net2 = net; net2; net2 >>= 8)
|
|
netbr[--nn] = net2 & 0xff;
|
|
switch (nn) {
|
|
case 3: /* Class A */
|
|
sprintf(qbuf, "0.0.0.%u.in-addr.arpa", netbr[3]);
|
|
break;
|
|
case 2: /* Class B */
|
|
sprintf(qbuf, "0.0.%u.%u.in-addr.arpa", netbr[3], netbr[2]);
|
|
break;
|
|
case 1: /* Class C */
|
|
sprintf(qbuf, "0.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1]);
|
|
break;
|
|
case 0: /* Class D - E */
|
|
sprintf(qbuf, "%u.%u.%u.%u.in-addr.arpa", netbr[3], netbr[2],
|
|
netbr[1], netbr[0]);
|
|
break;
|
|
}
|
|
anslen = res_query(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyaddr(net, net_type));
|
|
return (NULL);
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYADDR);
|
|
if (net_entry) {
|
|
unsigned u_net = net; /* maybe net should be unsigned ? */
|
|
|
|
/* Strip trailing zeros */
|
|
while ((u_net & 0xff) == 0 && u_net != 0)
|
|
u_net >>= 8;
|
|
net_entry->n_net = u_net;
|
|
return (net_entry);
|
|
}
|
|
return (_getnetbyaddr(net, net_type));
|
|
}
|
|
|
|
struct netent *
|
|
getnetbyname(net)
|
|
register const char *net;
|
|
{
|
|
int anslen;
|
|
querybuf buf;
|
|
char qbuf[MAXDNAME];
|
|
struct netent *net_entry;
|
|
|
|
if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
|
|
h_errno = NETDB_INTERNAL;
|
|
return (NULL);
|
|
}
|
|
strcpy(&qbuf[0], net);
|
|
anslen = res_search(qbuf, C_IN, T_PTR, (u_char *)&buf, sizeof(buf));
|
|
if (anslen < 0) {
|
|
#ifdef DEBUG
|
|
if (_res.options & RES_DEBUG)
|
|
printf("res_query failed\n");
|
|
#endif
|
|
if (errno == ECONNREFUSED)
|
|
return (_getnetbyname(net));
|
|
return (_getnetbyname(net));
|
|
}
|
|
net_entry = getnetanswer(&buf, anslen, BYNAME);
|
|
if (net_entry)
|
|
return (net_entry);
|
|
return (_getnetbyname(net));
|
|
}
|