derick Wed Nov 3 18:36:04 2004 EDT
Added files: (Branch: PHP_4_3)
/php-src/tests/lang bug30638.phpt
Modified files:
/php-src configure.in
/php-src/ext/standard formatted_print.c php_string.h scanf.c
string.c
/php-src/tests/lang 034.phpt
Log:
- MFH: Fixed bug #30630: Added a BSD based strtod function that is
locale-independent. (PHP part)
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.396.2.131&r2=1.396.2.132&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.396.2.131 php-src/configure.in:1.396.2.132
--- php-src/configure.in:1.396.2.131 Fri Oct 22 06:46:07 2004
+++ php-src/configure.in Wed Nov 3 18:35:57 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.396.2.131 2004/10/22 10:46:07 edink Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.396.2.132 2004/11/03 23:35:57 derick Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1213,7 +1213,7 @@
zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
zend_list.c zend_indent.c zend_builtin_functions.c zend_sprintf.c \
- zend_ini.c zend_qsort.c zend_multibyte.c)
+ zend_ini.c zend_qsort.c zend_multibyte.c zend_strtod.c)
if test -r "$abs_srcdir/Zend/zend_objects.c"; then
PHP_ADD_SOURCES(Zend, zend_objects.c zend_object_handlers.c zend_objects_API.c
zend_mm.c)
http://cvs.php.net/diff.php/php-src/ext/standard/formatted_print.c?r1=1.59.2.12&r2=1.59.2.13&ty=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.59.2.12
php-src/ext/standard/formatted_print.c:1.59.2.13
--- php-src/ext/standard/formatted_print.c:1.59.2.12 Thu Aug 26 09:41:59 2004
+++ php-src/ext/standard/formatted_print.c Wed Nov 3 18:36:01 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: formatted_print.c,v 1.59.2.12 2004/08/26 13:41:59 thies Exp $ */
+/* $Id: formatted_print.c,v 1.59.2.13 2004/11/03 23:36:01 derick Exp $ */
#include <math.h> /* modf() */
#include "php.h"
@@ -303,7 +303,14 @@
char *cvt;
register int i = 0, j = 0;
int sign, decpt, cvt_len;
- char decimal_point = EG(float_separator)[0];
+#ifdef HAVE_LOCALE_H
+ struct lconv lc;
+ char decimal_point;
+ localeconv_r(&lc);
+ decimal_point = (lc.decimal_point)[0];
+#else
+ char decimal_point = '.';
+#endif
PRINTF_DEBUG(("sprintf: appenddouble(%x, %x, %x, %f, %d, '%c', %d, %c)\n",
*buffer, pos, size, number, width, padding,
alignment, fmt));
http://cvs.php.net/diff.php/php-src/ext/standard/php_string.h?r1=1.65.2.3&r2=1.65.2.4&ty=u
Index: php-src/ext/standard/php_string.h
diff -u php-src/ext/standard/php_string.h:1.65.2.3
php-src/ext/standard/php_string.h:1.65.2.4
--- php-src/ext/standard/php_string.h:1.65.2.3 Thu Dec 4 07:45:32 2003
+++ php-src/ext/standard/php_string.h Wed Nov 3 18:36:01 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_string.h,v 1.65.2.3 2003/12/04 12:45:32 sniper Exp $ */
+/* $Id: php_string.h,v 1.65.2.4 2004/11/03 23:36:01 derick Exp $ */
/* Synced with php 3.0 revision 1.43 1999-06-16 [ssb] */
@@ -109,7 +109,7 @@
PHPAPI int strnatcmp_ex(char const *a, size_t a_len, char const *b, size_t b_len, int
fold_case);
#ifdef HAVE_LOCALECONV
-struct lconv *localeconv_r(struct lconv *out);
+PHPAPI struct lconv *localeconv_r(struct lconv *out);
#endif
PHPAPI char *php_strtoupper(char *s, size_t len);
http://cvs.php.net/diff.php/php-src/ext/standard/scanf.c?r1=1.16.4.8&r2=1.16.4.9&ty=u
Index: php-src/ext/standard/scanf.c
diff -u php-src/ext/standard/scanf.c:1.16.4.8 php-src/ext/standard/scanf.c:1.16.4.9
--- php-src/ext/standard/scanf.c:1.16.4.8 Wed Feb 18 14:49:16 2004
+++ php-src/ext/standard/scanf.c Wed Nov 3 18:36:02 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: scanf.c,v 1.16.4.8 2004/02/18 19:49:16 iliaa Exp $ */
+/* $Id: scanf.c,v 1.16.4.9 2004/11/03 23:36:02 derick Exp $ */
/*
scanf.c --
@@ -78,6 +78,7 @@
#endif
#include "zend_execute.h"
#include "zend_operators.h"
+#include "zend_strtod.h"
#include "php_globals.h"
#include "basic_functions.h"
#include "scanf.h"
@@ -1194,7 +1195,7 @@
if (!(flags & SCAN_SUPPRESS)) {
double dvalue;
*end = '\0';
- dvalue = strtod(buf, NULL);
+ dvalue = zend_strtod(buf, NULL);
if (numVars) {
current = args[objIndex++];
convert_to_double( *current );
http://cvs.php.net/diff.php/php-src/ext/standard/string.c?r1=1.333.2.45&r2=1.333.2.46&ty=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.333.2.45
php-src/ext/standard/string.c:1.333.2.46
--- php-src/ext/standard/string.c:1.333.2.45 Sun Oct 17 14:41:30 2004
+++ php-src/ext/standard/string.c Wed Nov 3 18:36:02 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.333.2.45 2004/10/17 18:41:30 iliaa Exp $ */
+/* $Id: string.c,v 1.333.2.46 2004/11/03 23:36:02 derick Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -133,7 +133,7 @@
#ifdef HAVE_LOCALECONV
/* {{{ localeconv_r
* glibc's localeconv is not reentrant, so lets make it so ... sorta */
-struct lconv *localeconv_r(struct lconv *out)
+PHPAPI struct lconv *localeconv_r(struct lconv *out)
{
struct lconv *res;
@@ -3139,18 +3139,6 @@
efree(args);
RETVAL_STRING(retval, 1);
- if (cat == LC_NUMERIC || cat == LC_ALL) {
- struct lconv lc;
- localeconv_r(&lc);
-
- EG(float_separator)[0] = (lc.decimal_point)[0];
-
- if ((lc.decimal_point)[0] != '.') {
- /* set locale back to C */
- setlocale(LC_NUMERIC, "C");
- }
- }
-
return;
}
http://cvs.php.net/diff.php/php-src/tests/lang/034.phpt?r1=1.6&r2=1.6.2.1&ty=u
Index: php-src/tests/lang/034.phpt
diff -u php-src/tests/lang/034.phpt:1.6 php-src/tests/lang/034.phpt:1.6.2.1
--- php-src/tests/lang/034.phpt:1.6 Wed Oct 23 16:35:16 2002
+++ php-src/tests/lang/034.phpt Wed Nov 3 18:36:02 2004
@@ -1,5 +1,5 @@
--TEST--
-Locale settings affecting float parsing
+Bug #12647 (Locale settings affecting float parsing)
--SKIPIF--
<?php # try to activate a german locale
if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
@@ -14,7 +14,6 @@
setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge");
echo (float)"3.14", "\n";
-
?>
--EXPECT--
3,14
http://cvs.php.net/co.php/php-src/tests/lang/bug30638.phpt?r=1.1&p=1
Index: php-src/tests/lang/bug30638.phpt
+++ php-src/tests/lang/bug30638.phpt
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
