cvs: php-src(PHP_5_2) / NEWS /ext/standard math.c /ext/standard/tests/strings bug29538.phpt

helly Sun Jul 16 10:50:58 2006 UTC Added files: (Branch: PHP_5_2) /php-src/ext/standard/tests/strings bug29538.phpt Modified files: /php-src/ext/standard math.c /php-src NEWS Log: - MFH Fixed Bug #29538 number_format and problem with 0 http://cvs.php.net/viewvc.cgi/php-src/ext/standard/math.c?r1=1.131.2.2&r2=1.131.2.2.2.1&diff_format=u Index: php-src/ext/standard/math.c diff -u php-src/ext/standard/math.c:1.131.2.2 php-src/ext/standard/math.c:1.131.2.2.2.1 --- php-src/ext/standard/math.c:1.131.2.2 Mon Feb 6 11:28:41 2006 +++ php-src/ext/standard/math.c Sun Jul 16 10:50:58 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: math.c,v 1.131.2.2 2006/02/06 11:28:41 tony2001 Exp $ */ +/* $Id: math.c,v 1.131.2.2.2.1 2006/07/16 10:50:58 helly Exp $ */ #include "php.h" #include "php_math.h" @@ -976,13 +976,8 @@ is_negative = 1; d = -d; } - if (!dec_point && dec > 0) { - d *= pow(10, dec); - dec = 0; - } else { - dec = MAX(0, dec); - } + dec = MAX(0, dec); PHP_ROUND_WITH_FUZZ(d, dec); tmplen = spprintf(&tmpbuf, 0, "%.*f", dec, d); @@ -991,8 +986,10 @@ return tmpbuf; } + /* find decimal point, if expected */ + dp = dec ? strchr(tmpbuf, '.') : NULL; + /* calculate the length of the return buffer */ - dp = strchr(tmpbuf, '.'); if (dp) { integral = dp - tmpbuf; } else { @@ -1008,7 +1005,11 @@ reslen = integral; if (dec) { - reslen += 1 + dec; + reslen += dec; + + if (dec_point) { + reslen++; + } } /* add a byte for minus sign */ @@ -1025,29 +1026,29 @@ * Take care, as the sprintf implementation may return less places than * we requested due to internal buffer limitations */ if (dec) { - int declen = dp ? strlen(dp+1) : 0; - int topad = declen > 0 ? dec - declen : 0; + int declen = dp ? s - dp : 0; + int topad = dec > declen ? dec - declen : 0; /* pad with '0's */ - while (topad--) { *t-- = '0'; } if (dp) { - /* now copy the chars after the point */ - memcpy(t - declen + 1, dp + 1, declen); - + s -= declen + 1; /* +1 to skip the point */ t -= declen; - s -= declen; + + /* now copy the chars after the point */ + memcpy(t + 1, dp + 1, declen); } /* add decimal point */ - *t-- = dec_point; - s--; + if (dec_point) { + *t-- = dec_point; + } } - /* copy the numbers before the decimal place, adding thousand + /* copy the numbers before the decimal point, adding thousand * separator every three digits */ while(s >= tmpbuf) { *t-- = *s--; http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.124&r2=1.2027.2.547.2.125&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.124 php-src/NEWS:1.2027.2.547.2.125 --- php-src/NEWS:1.2027.2.547.2.124 Sun Jul 16 10:37:24 2006 +++ php-src/NEWS Sun Jul 16 10:50:58 2006 @@ -192,6 +192,7 @@ stream context options). (Mike) - Fixed bug #34005 (oci_password_change() fails). (pholdaway at technocom-wireless dot com, Tony) +- Fixed bug #29538 (number_format and problem with 0). (Matthew Wilmas) 04 May 2006, PHP 5.1.4 - Added "capture_peer_cert" and "capture_peer_cert_chain" context options http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug29538.phpt?view=markup&rev=1.1 Index: php-src/ext/standard/tests/strings/bug29538.phpt +++ php-src/ext/standard/tests/strings/bug29538.phpt --TEST-- Bug #29538 (number_format and problem with 0) --FILE-- <?php echo number_format(0.25, 2, '', ''), "\n"; echo number_format(1234, 2, '', ','); ?> --EXPECT-- 025 1,23400