helly Sun May 16 10:01:45 2004 EDT
Modified files:
/php-src/ext/standard formatted_print.c
Log:
- Fix printf with floats
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.75&r2=1.76&ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.75
php-src/ext/standard/formatted_print.c:1.76
--- php-src/ext/standard/formatted_print.c:1.75 Tue May 11 15:51:46 2004
+++ php-src/ext/standard/formatted_print.c Sun May 16 10:01:45 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: formatted_print.c,v 1.75 2004/05/11 19:51:46 iliaa Exp $ */
+/* $Id: formatted_print.c,v 1.76 2004/05/16 14:01:45 helly Exp $ */
#include <math.h> /* modf() */
#include "php.h"
@@ -65,6 +65,7 @@
static char *php_convert_to_decimal(double arg, int ndigits, int *decpt, int *sign,
int eflag)
{
register int r2;
+ int mvl;
double fi, fj;
register char *p, *p1;
/*THREADX*/
@@ -90,13 +91,21 @@
p1 = &cvt_buf[NDIG];
while (fi != 0) {
fj = modf(fi / 10, &fi);
+ if (p1 <= &cvt_buf[0]) {
+ mvl = NDIG - ndigits;
+ memmove(&cvt_buf[mvl], &cvt_buf[0], NDIG-mvl-1);
+ p1 += mvl;
+ }
*--p1 = (int) ((fj + .03) * 10) + '0';
r2++;
}
while (p1 < &cvt_buf[NDIG])
*p++ = *p1++;
} else if (arg > 0) {
- while ((fj = arg * 10.0) < 0.9999999) {
+ while ((fj = arg * 10) < 1) {
+ if (!eflag && (r2 * -1) < ndigits) {
+ break;
+ }
arg = fj;
r2--;
}
@@ -109,10 +118,17 @@
cvt_buf[0] = '\0';
return (cvt_buf);
}
- while (p <= p1 && p < &cvt_buf[NDIG]) {
- arg *= 10;
- arg = modf(arg, &fj);
+ if (p <= p1 && p < &cvt_buf[NDIG]) {
+ arg = modf(arg * 10, &fj);
+ if ((int)fj==10) {
+ *p++ = '1';
+ fj = 0;
+ *decpt = ++r2;
+ }
+ while (p <= p1 && p < &cvt_buf[NDIG]) {
*p++ = (int) fj + '0';
+ arg = modf(arg * 10, &fj);
+ }
}
if (p1 >= &cvt_buf[NDIG]) {
cvt_buf[NDIG - 1] = '\0';
@@ -286,7 +302,7 @@
char numbuf[NUM_BUF_SIZE];
char *cvt;
register int i = 0, j = 0;
- int sign, decpt;
+ int sign, decpt, cvt_len;
char decimal_point = EG(float_separator)[0];
PRINTF_DEBUG(("sprintf: appenddouble(%x, %x, %x, %f, %d, '%c', %d, %c)\n",
@@ -312,6 +328,7 @@
}
cvt = php_convert_to_decimal(number, precision, &decpt, &sign, (fmt == 'e'));
+ cvt_len = strlen(cvt);
if (sign) {
numbuf[i++] = '-';
@@ -330,10 +347,15 @@
}
}
} else {
- while (decpt-- > 0)
- numbuf[i++] = cvt[j++];
- if (precision > 0)
+ while (decpt-- > 0) {
+ numbuf[i++] = j < cvt_len ? cvt[j++] : '0';
+ }
+ if (precision > 0) {
numbuf[i++] = decimal_point;
+ while (precision-- > 0) {
+ numbuf[i++] = j < cvt_len ? cvt[j++] : '0';
+ }
+ }
}
} else if (fmt == 'e' || fmt == 'E') {
char *exp_p;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
