Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/gmp/4.2.2/100-mpf_set_str.c.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sun Jan 25 17:53:14 2009 +0000 (2009-01-25)
changeset 1150 218f7a0e8d71
permissions -rw-r--r--
On 20090120.2203+0100, Andy Johnson <ajohnson@aecno.com> wrote:
The glibc.sh script doesn't handle the glibc versions with
an underscore very well (bash expected integer error). I
have attached a small patch for that. Instead of looking
for "not period" I changed the sense to look for numbers.
I initially tried to make it look for either a period or
an underscore, but that didn't work like I wanted (probably
because I did something wrong).

Original patch modified to be more robust.

/trunk/scripts/build/libc/glibc.sh | 8 4 4 0 ++++----
1 file changed, 4 insertions(+), 4 deletions(-) 
     1 Original patch from http://gmplib.org/patches/mpf_set_str.c.diff

     2 Re-diffed to match crosstool-NG conventions.

     3 

     4 diff -dur gmp-4.2.2.orig/mpf/set_str.c gmp-4.2.2/mpf/set_str.c

     5 --- gmp-4.2.2.orig/mpf/set_str.c	2007-08-30 20:31:40.000000000 +0200

     6 +++ gmp-4.2.2/mpf/set_str.c	2008-01-28 23:05:29.000000000 +0100

     7 @@ -271,8 +271,29 @@

     8        }

     9  

    10      if (expptr != 0)

    11 -      /* FIXME: Should do some error checking here.  */

    12 -      exp_in_base = strtol (expptr, (char **) 0, exp_base);

    13 +      {

    14 +	/* Scan and convert the exponent, in base exp_base.  */

    15 +	long dig, neg = -(long) ('-' == expptr[0]);

    16 +	expptr -= neg;			/* conditional increment */

    17 +	c = (unsigned char) *expptr++;

    18 +	dig = digit_value[c];

    19 +	if (dig >= exp_base)

    20 +	  {

    21 +	    TMP_FREE;

    22 +	    return -1;

    23 +	  }

    24 +	exp_in_base = dig;

    25 +	c = (unsigned char) *expptr++;

    26 +	dig = digit_value[c];

    27 +	while (dig < exp_base)

    28 +	  {

    29 +	    exp_in_base = exp_in_base * exp_base;

    30 +	    exp_in_base += dig;

    31 +	    c = (unsigned char) *expptr++;

    32 +	    dig = digit_value[c];

    33 +	  }

    34 +	exp_in_base = (exp_in_base ^ neg) - neg; /* conditional negation */

    35 +      }

    36      else

    37        exp_in_base = 0;

    38      if (dotpos != 0)
crosstool-ng