lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Update.

Browse Source 
1998-06-27  7:07  Richard Henderson  <rth@cygnus.com>

	* math/atest-exp.c (exp_mpn, main): Cast to mp_limb_t appropriately.
	* math/atest-exp2.c (exp_mpn, main): Likewise.
	* math/atest-sincos.c (main): Likewise.

	* resolv/inet_addr.c (inet_aton): Check for 32-bit overflow.  Move
	base handling away from strtoul.  Always reset errno.

	* sysdeps/alpha/Makefile (elf): Kill -mno-fp-regs.

	* sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Only set
	_dl_profile_map if _dl_name_match_p.
	(RTLD_START): Fix .prologue.  Set __libc_stack_end.
	* sysdeps/alpha/elf/start.S: Pass sp as arg 7.  Kill __data_start.

	* sysdeps/alpha/fpu/fraiseexcpt.c (feraiseexcept): Mark tmp
	as early-clobber.

	* sysdeps/libm-ieee754/e_exp10.c: Include "math_private.h".
	* sysdeps/libm-ieee754/e_exp10f.c: Likewise.
	* sysdeps/libm-ieee754/e_exp10l.c: Likewise.
This commit is contained in:
Ulrich Drepper
1998-06-27 09:52:12 +00:00
parent db24ce47ac
commit 69bf5f7547
15 changed files with 102 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
resolv/inet_addr.c
View File

@@ -102,13 +102,14 @@ inet_aton(cp, addr)
register u_int32_t val; /* changed from u_long --david */
register int base, n;
register char c;
u_int parts[4];
register u_int *pp = parts;
u_int32_t parts[4];
register u_int32_t *pp = parts;
#ifdef _LIBC
int saved_errno = errno;
__set_errno (0);
#endif
c = *cp;
for (;;) {
/*
@@ -117,7 +118,18 @@ inet_aton(cp, addr)
* 0x=hex, 0=octal, isdigit=decimal.
*/
if (!isdigit(c))
return (0);
goto ret_0;
#ifdef _LIBC
{
unsigned long ul = strtoul (cp, (char **) &cp, 0);
if (ul == ULONG_MAX && errno == ERANGE)
goto ret_0;
if (ul > 0xfffffffful)
goto ret_0;
val = ul;
}
c = *cp;
#else
base = 10;
if (c == '0') {
c = *++cp;
@@ -126,15 +138,6 @@ inet_aton(cp, addr)
else
base = 8;
}
#ifdef _LIBC
val = strtoul (cp, (char **) &cp, base);
if (val == ULONG_MAX && errno == ERANGE)
{
__set_errno (saved_errno);
return 0;
}
c = *cp;
#else
val = 0;
for (;;) {
if (isascii(c) && isdigit(c)) {
@@ -156,7 +159,7 @@ inet_aton(cp, addr)
* a.b (with b treated as 24 bits)
*/
if (pp >= parts + 3)
return (0);
goto ret_0;
*pp++ = val;
c = *++cp;
} else
@@ -166,7 +169,7 @@ inet_aton(cp, addr)
* Check for trailing characters.
*/
if (c != '\0' && (!isascii(c) || !isspace(c)))
return (0);
goto ret_0;
/*
* Concoct the address according to
* the number of parts specified.
@@ -175,30 +178,40 @@ inet_aton(cp, addr)
switch (n) {
case 0:
return (0); /* initial nondigit */
goto ret_0; /* initial nondigit */
case 1: /* a -- 32 bits */
break;
case 2: /* a.b -- 8.24 bits */
if (val > 0xffffff)
return (0);
goto ret_0;
val |= parts[0] << 24;
break;
case 3: /* a.b.c -- 8.8.16 bits */
if (val > 0xffff)
return (0);
goto ret_0;
val |= (parts[0] << 24) | (parts[1] << 16);
break;
case 4: /* a.b.c.d -- 8.8.8.8 bits */
if (val > 0xff)
return (0);
goto ret_0;
val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
break;
}
if (addr)
addr->s_addr = htonl(val);
#ifdef _LIBC
__set_errno (saved_errno);
#endif
return (1);
ret_0:
#ifdef _LIBC
__set_errno (saved_errno);
#endif
return (0);
}