mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
df21c8581a
Wed Aug 14 21:36:16 1996 Ulrich Drepper <drepper@cygnus.com> * stdlib/strtod.c (STRTOD): Correct assertion about size of wint_t and wchar_t. Reported by David Mosberger-Tang. Mon Aug 12 22:40:16 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * elf/dl-lookup.c (_dl_lookup_symbol): Remove fifth parameter RELOC_ADDR and make NOPLT a set of flags. All callers changed. Delete condition that checks for resolving to the location being filled in. Add condition to skip the executable's symbols if requested. * elf/link.h: Change declaration of _dl_lookup_symbol accordingly. (DL_LOOKUP_NOEXEC, DL_LOOKUP_NOPLT): New definitions. * elf/dl-reloc.c (RESOLVE): Remove second parameter and rename NOPLT to FLAGS. * elf/dl-runtime.c (RESOLVE): Likewise. * elf/rtld.c (RESOLVE): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Pass DL_LOOKUP_NOEXEC as second argument to the RESOLVE macro if processing a copy reloc, DL_LOOKUP_NOPLT for a jump slot reloc, zero otherwise. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_rel): Likewise. Wed Aug 14 17:57:08 1996 Ulrich Drepper <drepper@cygnus.com> * MakeTAGS: Clean up use of --omit-header and -n for xgettext. * po/header.pot: Add empty line at end. Sun Aug 11 13:45:33 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * MakeTAGS (all-pot): Remove $P/errlist.pot, all error messages are now in $P/stdio-common.pot. (XGETTEXTFLAGS-errlist.pot): Variable removed. Mon Aug 12 19:25:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * Makerules (do-ar, o-iterator-doit): Compute path to autolock script at run time, not configure time. * config.make.in, configure.in: Undo previous change. Wed Aug 14 13:20:02 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/i386/close.S: Push return value of thread on stack as argument for `_exit'. Reported by Andreas Schwab. Mon Aug 12 19:36:25 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/clone.S: New file. Wed Aug 14 04:22:35 1996 Richard Henderson <rth@tamu.edu> * elf/dl-load.c (_dl_map_object): Save name in malloced memory. (_dl_map_object_from_fd): Free name on error. Wed Aug 14 13:00:09 1996 Ulrich Drepper <drepper@cygnus.com> * string/strdup.c: Use result of memcpy to avoid reloading. Tue Aug 13 00:55:03 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * shadow/sgetspent_r.c (__sgetspent_r): Copy string to buffer, not the other way round. * resolv/Makefile (libresolv-routines): Add base64, inet_net_ntop, inet_net_pton, inet_net. * resolv/arpa/nameser.h (__BIND): Update version number. Mon Aug 12 19:03:22 1996 Thomas Bushnell n/BSG <thomas@psilocin.gnu.ai.mit.edu> * sysdeps/generic/gnu/types.h: Declare __fd_mask as `unsigned long'. * mach/Makefile (mach/mach_host.uh): Depend on $(objpfx)/mach-syscalls.mk. ($(objpfx)mach-shortcuts.h): Depend on $(objpfx)mach/mach_host.h. (This fixes a make loop; thanks to Marcus Daniels <marcus@sysc.pdx.edu> for the patch.)
202 lines
4.9 KiB
C
202 lines
4.9 KiB
C
/*
|
|
* Copyright (c) 1996 by Internet Software Consortium.
|
|
*
|
|
* 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.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
|
|
* ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
|
|
* CONSORTIUM 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static const char rcsid[] = "$Id$";
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
|
|
#include <assert.h>
|
|
#include <ctype.h>
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
|
|
#ifdef SPRINTF_CHAR
|
|
# define SPRINTF(x) strlen(sprintf/**/x)
|
|
#else
|
|
# define SPRINTF(x) ((size_t)sprintf x)
|
|
#endif
|
|
|
|
static int inet_net_pton_ipv4 __P((const char *src, u_char *dst,
|
|
size_t size));
|
|
|
|
/*
|
|
* static int
|
|
* inet_net_pton(af, src, dst, size)
|
|
* convert network number from presentation to network format.
|
|
* accepts hex octets, hex strings, decimal octets, and /CIDR.
|
|
* "size" is in bytes and describes "dst".
|
|
* return:
|
|
* number of bits, either imputed classfully or specified with /CIDR,
|
|
* or -1 if some failure occurred (check errno). ENOENT means it was
|
|
* not a valid network specification.
|
|
* author:
|
|
* Paul Vixie (ISC), June 1996
|
|
*/
|
|
int
|
|
inet_net_pton(af, src, dst, size)
|
|
int af;
|
|
const char *src;
|
|
void *dst;
|
|
size_t size;
|
|
{
|
|
switch (af) {
|
|
case AF_INET:
|
|
return (inet_net_pton_ipv4(src, dst, size));
|
|
default:
|
|
errno = EAFNOSUPPORT;
|
|
return (-1);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* static int
|
|
* inet_net_pton_ipv4(src, dst, size)
|
|
* convert IPv4 network number from presentation to network format.
|
|
* accepts hex octets, hex strings, decimal octets, and /CIDR.
|
|
* "size" is in bytes and describes "dst".
|
|
* return:
|
|
* number of bits, either imputed classfully or specified with /CIDR,
|
|
* or -1 if some failure occurred (check errno). ENOENT means it was
|
|
* not an IPv4 network specification.
|
|
* note:
|
|
* network byte order assumed. this means 192.5.5.240/28 has
|
|
* 0x11110000 in its fourth octet.
|
|
* author:
|
|
* Paul Vixie (ISC), June 1996
|
|
*/
|
|
static int
|
|
inet_net_pton_ipv4(src, dst, size)
|
|
const char *src;
|
|
u_char *dst;
|
|
size_t size;
|
|
{
|
|
static const char
|
|
xdigits[] = "0123456789abcdef",
|
|
digits[] = "0123456789";
|
|
int n, ch, tmp, dirty, bits;
|
|
const u_char *odst = dst;
|
|
|
|
bits = -1;
|
|
ch = *src++;
|
|
|
|
if (ch == '0' && (src[0] == 'x' || src[0] == 'X')
|
|
&& isascii(src[1]) && isxdigit(src[1])) {
|
|
/* Hexadecimal: Eat nybble string. */
|
|
if (size <= 0)
|
|
goto emsgsize;
|
|
*dst = 0, dirty = 0;
|
|
src++; /* skip x or X. */
|
|
while ((ch = *src++) != '\0' &&
|
|
isascii(ch) && isxdigit(ch)) {
|
|
if (isupper(ch))
|
|
ch = tolower(ch);
|
|
n = strchr(xdigits, ch) - xdigits;
|
|
assert(n >= 0 && n <= 15);
|
|
*dst |= n;
|
|
if (!dirty++)
|
|
*dst <<= 4;
|
|
else if (size-- > 0)
|
|
*++dst = 0, dirty = 0;
|
|
else
|
|
goto emsgsize;
|
|
}
|
|
if (dirty)
|
|
size--;
|
|
} else if (isascii(ch) && isdigit(ch)) {
|
|
/* Decimal: eat dotted digit string. */
|
|
for (;;) {
|
|
tmp = 0;
|
|
do {
|
|
n = strchr(digits, ch) - digits;
|
|
assert(n >= 0 && n <= 9);
|
|
tmp *= 10;
|
|
tmp += n;
|
|
if (tmp > 255)
|
|
goto enoent;
|
|
} while ((ch = *src++) != '\0' &&
|
|
isascii(ch) && isdigit(ch));
|
|
if (size-- <= 0)
|
|
goto emsgsize;
|
|
*dst++ = (u_char) tmp;
|
|
if (ch == '\0' || ch == '/')
|
|
break;
|
|
if (ch != '.')
|
|
goto enoent;
|
|
ch = *src++;
|
|
if (!isascii(ch) || !isdigit(ch))
|
|
goto enoent;
|
|
}
|
|
} else
|
|
goto enoent;
|
|
|
|
if (ch == '/' && isascii(src[0]) && isdigit(src[0]) && dst > odst) {
|
|
/* CIDR width specifier. Nothing can follow it. */
|
|
ch = *src++; /* Skip over the /. */
|
|
bits = 0;
|
|
do {
|
|
n = strchr(digits, ch) - digits;
|
|
assert(n >= 0 && n <= 9);
|
|
bits *= 10;
|
|
bits += n;
|
|
} while ((ch = *src++) != '\0' &&
|
|
isascii(ch) && isdigit(ch));
|
|
if (ch != '\0')
|
|
goto enoent;
|
|
}
|
|
|
|
/* Firey death and destruction unless we prefetched EOS. */
|
|
if (ch != '\0')
|
|
goto enoent;
|
|
|
|
/* If nothing was written to the destination, we found no address. */
|
|
if (dst == odst)
|
|
goto enoent;
|
|
/* If no CIDR spec was given, infer width from net class. */
|
|
if (bits == -1) {
|
|
if (*odst >= 224)
|
|
bits = 4;
|
|
else if (*odst >= 192)
|
|
bits = 24;
|
|
else if (*odst >= 128)
|
|
bits = 16;
|
|
else
|
|
bits = 8;
|
|
}
|
|
/* Extend network to cover the actual mask. */
|
|
while (bits > ((dst - odst) * 8)) {
|
|
if (size-- <= 0)
|
|
goto emsgsize;
|
|
*dst++ = '\0';
|
|
}
|
|
return (bits);
|
|
|
|
enoent:
|
|
errno = ENOENT;
|
|
return (-1);
|
|
|
|
emsgsize:
|
|
errno = EMSGSIZE;
|
|
return (-1);
|
|
}
|