glibc/nss/digits_dots.c

277 lines
6.9 KiB
C
Raw Normal View History

update from main archive 960107 Tue Jan 7 09:48:15 1997 Andreas Jaeger <aj@arthur.pfalz.de> * signal/sigempty.c (sigemptyset): Correct typo: Empty set should have all bits zero. Tue Jan 7 23:44:39 1997 Ulrich Drepper <drepper@cygnus.com> * inet/gethstbynm.c: Include additional headers for additional code in nss/digits_dots.c. * inet/gethstbynm_r.c: Likewise. * inet/gethstbynm2.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * nss/digits_dots.c: New file. Handle dotted pair notation for gethstbynm functions. * nss/getXXbyYY.c: Include digits_dots.c to get extra code for handling dotted pair notation. * nss/getXXbyYY_r.c: Likewise. Patches by HJ Lu. * resolv/nss_dns/dns-host.c: Don't handle dotted pair notation. * io/getwd.c: Optimized a bit. * signal/signal.h: Always declare __sysv_signal. * sysdeps/generic/setenv.c: Add some portability code. * sysdeps/unix/sysv/fcntlbits.h: Update copyright. * sysdeps/unix/sysv/linux/fcntlbits.h: Add definitions from kernel to avoid using kernel headers. * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: New file. Alpha specific version. * sysdeps/unix/sysv/linux/syscalls.list: Add sys_mknod. Don't mark sigreturn as EXTRA. * sysdeps/unix/sysv/linux/ustat.c: Declare __syscall_ustat. * sysdeps/unix/sysv/linux/alpha/ustat.c: New file. Alpha version. Tue Jan 7 09:48:15 1997 Andreas Jaeger <aj@arthur.pfalz.de> * io/fts.c (fts_alloc): Add const to second parameter of function. * io/Makefile: Change CFLAGS-fts.c and define CFLAGS-ftw.c to prevent warnings. * signal/sigfillset.c: Include <string.h> for memset declaration. Tue Jan 7 11:14:32 1997 Miles Bader <miles@gnu.ai.mit.edu> * sysdeps/generic/setenv.c: Fix portability problems. Tue Jan 7 02:10:17 1997 Ulrich Drepper <drepper@cygnus.com> * posix/getopt.c (_getopt_internal): Don't reset __getopt_initialized after the last option was seen. Mon Jan 6 15:30:21 1997 Ulrich Drepper <drepper@cygnus.com> * elf/elf.h (DT_EXTRANUM): Set to 3 since 0x7ffffffd is used.
1997-01-08 07:29:44 +08:00
/* Copyright (C) 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by H.J. Lu <hjl@gnu.ai.mit.edu>, 1997.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public License as
published by the Free Software Foundation; either version 2 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
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
/*
* disallow names consisting only of digits/dots, unless
* they end in a dot.
*/
if (isdigit (name[0]) || (isxdigit (name[0]) || name[0] == ':'))
{
const char *cp;
char *hostname;
struct hostent *host;
typedef unsigned char host_addr_t [16];
host_addr_t *host_addr;
typedef char *host_addr_list_t [2];
host_addr_list_t *host_aliases;
host_addr_list_t *h_addr_ptrs;
size_t size_needed;
int addr_size;
#ifndef HAVE_AF
int af = -1;
#endif
switch (af)
{
case AF_INET:
addr_size = INADDRSZ;
break;
case AF_INET6:
addr_size = IN6ADDRSZ;
break;
default:
af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
addr_size = (af == AF_INET6 ) ? IN6ADDRSZ : INADDRSZ;
break;
}
size_needed = (sizeof (*host) + sizeof (*host_addr)
+ sizeof (*host_aliases) + sizeof (*h_addr_ptrs)
+ strlen (name) + 1);
#ifdef HAVE_LOOKUP_BUFFER
if (buflen < size_needed)
{
__set_errno (ERANGE);
goto done;
}
#else
if (buffer_size < size_needed)
{
char *new_buf;
buffer_size = size_needed;
new_buf = realloc (buffer, buffer_size);
if (new_buf == NULL)
{
save = errno;
free (buffer);
buffer = NULL;
buffer_size = 0;
__set_errno (save);
result = (struct hostent *) NULL;
goto done;
}
buffer = new_buf;
}
#endif /* HAVE_LOOKUP_BUFFER */
memset (buffer, 0, size_needed);
host = (struct hostent *) buffer;
host_addr = (host_addr_t *) ((char *) host + sizeof (*host));
host_aliases = (host_addr_list_t *)
((char *) host_addr + sizeof (*host_addr));
h_addr_ptrs = (host_addr_list_t *)
((char *) host_aliases + sizeof (*host_aliases));
hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
if (isdigit (name[0]))
{
for (cp = name;; ++cp)
{
if (!*cp)
{
if (*--cp == '.') break;
/* All-numeric, no dot at the end. Fake up a hostent as if
we'd actually done a lookup. What if someone types
255.255.255.255? The test below will succeed
spuriously... ??? */
if (inet_pton (af, name, host_addr) <= 0)
{
__set_h_errno (HOST_NOT_FOUND);
#ifndef HAVE_LOOKUP_BUFFER
result = (struct hostent *) NULL;
#endif
goto done;
}
strcpy (hostname, name);
host->h_name = hostname;
host->h_aliases = *host_aliases;
(*host_aliases)[0] = NULL;
(*h_addr_ptrs)[0] = (char *)host_addr;
(*h_addr_ptrs)[1] = (char *)0;
host->h_addr_list = *h_addr_ptrs;
if (_res.options & RES_USE_INET6 && af == AF_INET)
{
/* We need to change the IP v4 address into the
IP v6 address. */
char tmp[INADDRSZ], *p = (char *) host_addr;
int i;
/* Save a copy of the IP v4 address. */
memcpy (tmp, host_addr, INADDRSZ);
/* Mark this ipv6 addr as a mapped ipv4. */
for (i = 0; i < 10; i++)
*p++ = 0x00;
*p++ = 0xff;
*p++ = 0xff;
/* Copy the IP v4 address. */
memcpy (p, tmp, INADDRSZ);
host->h_addrtype = AF_INET6;
host->h_length = IN6ADDRSZ;
}
else
{
host->h_addrtype = af;
host->h_length = addr_size;
}
__set_h_errno (NETDB_SUCCESS);
#ifdef HAVE_LOOKUP_BUFFER
status = NSS_STATUS_SUCCESS;
#else
result = host;
#endif
goto done;
}
if (!isdigit (*cp) && *cp != '.') break;
}
}
if (isxdigit (name[0]) || name[0] == ':')
{
const char *cp;
char *hostname;
struct hostent *host;
typedef unsigned char host_addr_t [16];
host_addr_t *host_addr;
typedef char *host_addr_list_t [2];
host_addr_list_t *host_aliases;
host_addr_list_t *h_addr_ptrs;
size_t size_needed;
int addr_size;
#ifndef HAVE_AF
int af = -1;
#endif
switch (af)
{
case AF_INET:
addr_size = INADDRSZ;
break;
case AF_INET6:
addr_size = IN6ADDRSZ;
break;
default:
af = (_res.options & RES_USE_INET6) ? AF_INET6 : AF_INET;
addr_size = (af == AF_INET6 ) ? IN6ADDRSZ : INADDRSZ;
break;
}
size_needed = (sizeof (*host) + sizeof (*host_addr)
+ sizeof (*host_aliases) + sizeof (*h_addr_ptrs)
+ strlen (name) + 1);
#ifdef HAVE_LOOKUP_BUFFER
if (buflen < size_needed)
{
__set_errno (ERANGE);
goto done;
}
#else
if (buffer_size < size_needed)
{
char *new_buf;
buffer_size = size_needed;
new_buf = realloc (buffer, buffer_size);
if (new_buf == NULL)
{
save = errno;
free (buffer);
__set_errno (save);
buffer = NULL;
buffer_size = 0;
result = (struct hostent *) NULL;
goto done;
}
buffer = new_buf;
}
#endif /* HAVE_LOOKUP_BUFFER */
memset (buffer, 0, size_needed);
host = (struct hostent *) buffer;
host_addr = (host_addr_t *) ((char *) host + sizeof (*host));
host_aliases = (host_addr_list_t *)
((char *) host_addr + sizeof (*host_addr));
h_addr_ptrs = (host_addr_list_t *)
((char *) host_aliases + sizeof (*host_aliases));
hostname = (char *) h_addr_ptrs + sizeof (*h_addr_ptrs);
for (cp = name;; ++cp)
{
if (!*cp)
{
update from main archive 970218 1997-02-19 03:28 Miles Bader <miles@gnu.ai.mit.edu> * argp/argp-help.c: Add support for user provided filter of help messages. * argp/argp-parse.c: Likewise. * argp/argp.h: Likewise. * argp/argp-namefrob.h: Define __argp_input. * argp/argp-test.c: Add example for filter. 1997-02-19 02:58 Ulrich Drepper <drepper@cygnus.com> * argp.h: New file. * locale/programs/locale.c: Switch to use argp. * errno.h: Make it possible to get definition of error_t even after having errno.h already. * elf/dl-hash.h: New file. ELF hashing function. Extracted from dl-lookup.c. * elf/dl-lookup.c (_dl_elf_hash): Remove definition. * elf/dl-load.c: Rename _dl_does_name_match_p to _dl_name_match_p. * elf/dl-version.c: Likewise. * elf/dl-lookup.c: Implement new versioning lookup scheme. * elf/dl-version.c (_dl_check_map_versions): Initialize new field in l_versions member. * elf/dlvsym.c: Correct call of _dl_lookup_versioned_symbol_skip and _dl_lookup_versioned_symbol. * elf/link.h: Rename hash_name_pair to struct r_found_version. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/mips/dl-machine.h: Likewise. * intl/l10nflist.c: (_nl_make_l10nflist): Fix bug in computation of length of abs_filename. * locale/Makefile (CPPFLAGS): Define LOCALE_ALIAS_PATH. * locale/programs/ld-monetary.c (monetary_add): Allow value 0 in mon_grouping information. This means no more grouping. * locale/programs/ld-numeric.c (numeric_add): Write value \377 when seein value 0 in grouping information. * locale/programs/linereader.c (lr_close): Don't free fname since it might be used in error messages. * locale/programs/locale.c: Check whether output of `locale -a' really is locale directory. Also print locale aliases. * misc/search.h (__action_fn_t): Parameters VALUE and LEVEL cannot be const. 1997-02-19 02:16 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: Correct #defin to #define. Reported by Rick Flower <FLOWER@sdvax2.sdd.TRW.COM>. 1997-02-19 01:37 Erik Troan <ewt@redhat.com> * shadow/sgetspent_r.c: Accept empty third, fourth and fifth fields. 1997-02-19 01:02 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/mman/syscalls.list: msync takes 3 arguments. Reported by Andreas Jaeger <aj@arthur.pfalz.de>. * sysdeps/stub/msync.c (msync): Add missing third parameter. 1997-02-19 00:29 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/bsd/sigsuspend.c: Call __sigpause with needed additional argument. 1997-02-18 22:13 Ulrich Drepper <drepper@cygnus.com> * inet/net/ethernet.h: New file. * sysdeps/unix/sysv/linux/netinet/if_ether.c: Add BSD compatibility. * sysdeps/unix/sysv/linux/net/if_slip.h: New file. Contributed by a sun <asun@zoology.washington.edu>. * sysdeps/unix/sysv/linux/net/if_arp.h: Include <sys/socket.h>. * sunrpc/rpc/rpc_msg.h: Include <rpc/clnt.h>. Reported by a sun <asun@zoology.washington.edu>. 1997-02-16 14:25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules ((common-objpfx)distinfo-$(subdir)): Depend on sysdep makefiles which may change the distinfo variables. 1997-02-16 14:03 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/Makefile (sysdep_headers) [$(subdir)=misc]: Add sys/quota.h. (sysdep_headers) [$(subdir)=inet]: Add netinet/udp.h. 1997-02-17 13:12 aleph1@dfw.net * sunrpc/clnt_simp.c (callrpc): Prevent buffer overflow by using strncpy. 1997-02-18 03:28 Ulrich Drepper <drepper@cygnus.com> * stdio-common/bug10.c (main): Correct parameter. 1997-02-17 02:51 Ulrich Drepper <drepper@cygnus.com> * malloc/obstack.h: Add `extern "C"' protection. * posix/regex.h: Likewise. * io/ftw.h: Likewise. * misc/libgen.h: Likewise. * login/utmp.h: Likewise. * sysdeps/unix/sysv/linux/sys/reboot.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Likewise. * sunrpc/rpc/pmap_rmt.h: Likewise. * sunrpc/rpc/auth_des.h: Likewise. * elf/link.h: Likewise. Reported by HJ Lu. 1997-02-17 01:45 a sun <asun@zoology.washington.edu> Linux specific network headers. * sysdeps/unix/sysv/linux/netinet/if_fddi.h: New file. * sysdeps/unix/sysv/linux/netinet/if_tr.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip_fw.h: New file. * sysdeps/unix/sysv/linux/netinet/igmp.h: New file. * sysdeps/unix/sysv/linux/netinet/icmp.h: New file. * sysdeps/unix/sysv/linux/netinet/ip.h: New file. * sysdeps/unix/sysv/linux/netinet/tcp.h: New file. * sysdeps/unix/sysv/linux/netipx/ipx.h: New file. * sysdeps/unix/sysv/linux/netatalk/atalk.h: New file. * sysdeps/unix/sysv/linux/Dist: Add new network headers. * sysdeps/unix/sysv/linux/Makefile [$(subdir)=misc] (sysdep_headers): Add sys/quota.h. [$(subdir)=inet] (sysdep_headers): Add new network header. * sysdeps/unix/sysv/linux/netinet/udp.h: Add Linux specific changes. * inet/netinet/ip.h: Move to sysdeps/generic. * inet/netinet/tcp.h: Likewise. * sysdeps/generic/netinet/ip.h: Moved to here from inet/netinet. * sysdeps/generic/netinet/tcp.h: Likewise. 1997-02-17 01:18 Ulrich Drepper <drepper@cygnus.com> * misc/sys/syslog.h (prioritynames): Correct definition to use braces where necessary. (facilitynames): Likewise. Patch by Ronald F. Guilmette <rfg@monkeys.com>. Comment and beautify declarations. 1997-02-16 19:54 1997 Philip Blundell <Philip.Blundell@pobox.com> * inet/Makefile (routines): Add in6_addr, getnameinfo. * inet/getnameinfo.c: New file. Implementation of getnameinfo() by Craig Metz. * inet/in6_addr.c: New file. IPv6 addressing constants. * posix/Makefile (routines): Add gai_strerror. * resolv/netdb.h: Add more constants for IPv6 basic API. * sysdeps/posix/gai_strerror.c: New file. * sysdeps/stub/gai_strerror.c New file. * sysdeps/unix/sysv/linux/netinet/in.h: Add definitions for IPv6 basic API. * sysdeps/posix/getaddrinfo.c: Update from latest version by Craig Metz and use reentrant getXXbyYY functions. 1997-02-15 14:32 Andreas Jaeger <aj@arthur.pfalz.de> * argp/argp.h: Declare argp_program_version as const char. * argp/argp-test.c: Likewise * stdlib/testrand.c (main): Declare main prototype. * stdlib/testdiv.c (main): Likewise. * string/testcopy.c (main): Likewise. * string/test-ffs.c (main): Likewise. * time/test_time.c (main): Likewise. * locale/duplocale.c (__duplocale): Return result. 1997-02-16 03:54 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/netinet/in.h: Declare bindresvport. Reported by fabsoft@fabserver1.zarm.uni-bremen.de. * nss/nss.h: Remove declaration of __nss_shlib_revision. * nss/nsswitch.c: Don't use NSS_SHLIB_VERSION macro. 1997-02-16 03:48 Thorsten Kukuk <kukuk@weber.uni-paderborn.de> * nis/nss_nis/nis-ethers.c (_nss_nis_getethernam_r): Rename to _nss_nis_gethostton_r. (_nss_nis_getetherbyaddr_r): Rename to _nss_nis_getntohost_r. 1997-02-15 22:37 Andy Berkheimer <andy@tho.org> * resolv/gethnamaddr.c (gethostbyname2): Test for ':' in name before trying to resolv name as numeric IPv6 address. * nss/digits_dots.c: Likewise. Sat Feb 15 04:51:08 1997 Ulrich Drepper <drepper@cygnus.com> * locale/setlocale.c (setlocale): Don't try to be clever about unused locales. When the existence of the locale files isn't tested the result of setlocale might be different. 1997-02-15 03:34 Ulrich Drepper <drepper@cygnus.com> * locale/setlocale.c (setlocale): Don't increment usage_count of new locale if it already has the value MAX_USAGE_COUNT (it might be the C locale data which is read-only).
1997-02-19 12:43:53 +08:00
if (*--cp == '.')
break;
if (!strchr (name, ':'))
break;
update from main archive 960107 Tue Jan 7 09:48:15 1997 Andreas Jaeger <aj@arthur.pfalz.de> * signal/sigempty.c (sigemptyset): Correct typo: Empty set should have all bits zero. Tue Jan 7 23:44:39 1997 Ulrich Drepper <drepper@cygnus.com> * inet/gethstbynm.c: Include additional headers for additional code in nss/digits_dots.c. * inet/gethstbynm_r.c: Likewise. * inet/gethstbynm2.c: Likewise. * inet/gethstbynm2_r.c: Likewise. * nss/digits_dots.c: New file. Handle dotted pair notation for gethstbynm functions. * nss/getXXbyYY.c: Include digits_dots.c to get extra code for handling dotted pair notation. * nss/getXXbyYY_r.c: Likewise. Patches by HJ Lu. * resolv/nss_dns/dns-host.c: Don't handle dotted pair notation. * io/getwd.c: Optimized a bit. * signal/signal.h: Always declare __sysv_signal. * sysdeps/generic/setenv.c: Add some portability code. * sysdeps/unix/sysv/fcntlbits.h: Update copyright. * sysdeps/unix/sysv/linux/fcntlbits.h: Add definitions from kernel to avoid using kernel headers. * sysdeps/unix/sysv/linux/alpha/fcntlbits.h: New file. Alpha specific version. * sysdeps/unix/sysv/linux/syscalls.list: Add sys_mknod. Don't mark sigreturn as EXTRA. * sysdeps/unix/sysv/linux/ustat.c: Declare __syscall_ustat. * sysdeps/unix/sysv/linux/alpha/ustat.c: New file. Alpha version. Tue Jan 7 09:48:15 1997 Andreas Jaeger <aj@arthur.pfalz.de> * io/fts.c (fts_alloc): Add const to second parameter of function. * io/Makefile: Change CFLAGS-fts.c and define CFLAGS-ftw.c to prevent warnings. * signal/sigfillset.c: Include <string.h> for memset declaration. Tue Jan 7 11:14:32 1997 Miles Bader <miles@gnu.ai.mit.edu> * sysdeps/generic/setenv.c: Fix portability problems. Tue Jan 7 02:10:17 1997 Ulrich Drepper <drepper@cygnus.com> * posix/getopt.c (_getopt_internal): Don't reset __getopt_initialized after the last option was seen. Mon Jan 6 15:30:21 1997 Ulrich Drepper <drepper@cygnus.com> * elf/elf.h (DT_EXTRANUM): Set to 3 since 0x7ffffffd is used.
1997-01-08 07:29:44 +08:00
/* All-IPv6-legal, no dot at the end. Fake up a
hostent as if we'd actually done a lookup. */
if (inet_pton (af, name, host_addr) <= 0)
{
__set_h_errno (HOST_NOT_FOUND);
#ifndef HAVE_LOOKUP_BUFFER
result = (struct hostent *) NULL;
#endif
goto done;
}
strcpy (hostname, name);
host->h_name = hostname;
host->h_aliases = *host_aliases;
(*host_aliases)[0] = NULL;
(*h_addr_ptrs)[0] = (char *) host_addr;
(*h_addr_ptrs)[1] = (char *) 0;
host->h_addr_list = *h_addr_ptrs;
host->h_addrtype = af;
host->h_length = addr_size;
__set_h_errno (NETDB_SUCCESS);
#ifdef HAVE_LOOKUP_BUFFER
status = NSS_STATUS_SUCCESS;
#else
result = host;
#endif
goto done;
}
if (!isxdigit (*cp) && *cp != ':' && *cp != '.') break;
}
}
}