d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some changes the vendor didn't want:

Browse Source 
- Accept the '0x' prefix so strtod("nan(0x...)", NULL) returns the same
  thing as gcc's builtin nan("0x...") for such strings.
- Don't return uninitialized memory.
- Finish processing the string up to the closing ')' (provided it's
  lexically valid) for compatibility with C99 and *scanf().
This commit is contained in:
das 2007-12-16 21:13:54 +00:00
parent b3d67d43ff
commit b2367c2d0b
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
contrib/gdtoa/hexnan.c
View File

@ -29,6 +29,8 @@ THIS SOFTWARE.
/* Please send bug reports to David M. Gay (dmg at acm dot org, /* Please send bug reports to David M. Gay (dmg at acm dot org,
* with " at " changed at "@" and " dot " changed to "."). */ * with " at " changed at "@" and " dot " changed to "."). */
/* $FreeBSD$ */
#include "gdtoaimp.h" #include "gdtoaimp.h"
static void static void
@ -71,8 +73,14 @@ hexnan( CONST char **sp, FPI *fpi, ULong *x0)
x1 = xe = x; x1 = xe = x;
havedig = hd0 = i = 0; havedig = hd0 = i = 0;
s = *sp; s = *sp;
/* FreeBSD local: Accept (but ignore) the '0x' prefix. */
if (s[1] == '0' && (s[2] == 'x' || s[2] == 'X'))
s += 2;
while(c = *(CONST unsigned char*)++s) { while(c = *(CONST unsigned char*)++s) {
if (!(h = hexdig[c])) { if (!(h = hexdig[c])) {
#if 0
if (c <= ' ') { if (c <= ' ') {
if (hd0 < havedig) { if (hd0 < havedig) {
if (x < x1 && i < 8) if (x < x1 && i < 8)
@ -92,7 +100,8 @@ hexnan( CONST char **sp, FPI *fpi, ULong *x0)
*sp = s + 1; *sp = s + 1;
break; break;
} }
return STRTOG_NaN; #endif
break;
} }
havedig++; havedig++;
if (++i > 8) { if (++i > 8) {
@ -103,9 +112,7 @@ hexnan( CONST char **sp, FPI *fpi, ULong *x0)
} }
*x = (*x << 4) | h & 0xf; *x = (*x << 4) | h & 0xf;
} }
if (!havedig) if (havedig && x < x1 && i < 8)
return STRTOG_NaN;
if (x < x1 && i < 8)
L_shift(x, x1, i); L_shift(x, x1, i);
if (x > x0) { if (x > x0) {
x1 = x0; x1 = x0;
@ -119,6 +126,7 @@ hexnan( CONST char **sp, FPI *fpi, ULong *x0)
if ( (i = nbits & (ULbits-1)) !=0) if ( (i = nbits & (ULbits-1)) !=0)
*xe &= ((ULong)0xffffffff) >> (ULbits - i); *xe &= ((ULong)0xffffffff) >> (ULbits - i);
} }
if (havedig) {
for(x1 = xe;; --x1) { for(x1 = xe;; --x1) {
if (*x1 != 0) if (*x1 != 0)
break; break;
@ -127,5 +135,22 @@ hexnan( CONST char **sp, FPI *fpi, ULong *x0)
break; break;
} }
} }
}
/*
* FreeBSD local: Accept all the sequences allowed by C99 and update
* the tail pointer correctly. Don't accept any invalid sequences.
*/
if (c == '\0') /* nan() calls this, too; tolerate a missing ')' */
return STRTOG_NaNbits;
if (c != ')') {
while(c = *(CONST unsigned char*)++s) {
if (c == ')')
break;
if (!isalnum(c) && c != '_')
return STRTOG_NaNbits;
}
}
*sp = s + 1;
return STRTOG_NaNbits; return STRTOG_NaNbits;
} }