tony2001 Fri Dec 16 20:50:39 2005 EDT
Modified files:
/php-src/ext/standard basic_functions.c
Log:
MF51: fix #35713 (getopt() returns array with numeric strings when passed
options like '-1')
TODO:
make getopt() unicode aware
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.741&r2=1.742&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.741
php-src/ext/standard/basic_functions.c:1.742
--- php-src/ext/standard/basic_functions.c:1.741 Thu Dec 8 03:25:42 2005
+++ php-src/ext/standard/basic_functions.c Fri Dec 16 20:50:38 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.741 2005/12/08 03:25:42 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.742 2005/12/16 20:50:38 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1573,6 +1573,7 @@
char *optname;
int argc = 0, options_len = 0, o;
zval *val, **args = NULL, *p_longopts = NULL;
+ int optname_len = 0;
#ifdef HARTMUT_0
struct option *longopts = NULL;
int longindex = 0;
@@ -1706,14 +1707,28 @@
}
/* Add this option / argument pair to the result hash. */
- if(zend_hash_find(HASH_OF(return_value), optname,
strlen(optname)+1, (void **)&args) != FAILURE) {
- if(Z_TYPE_PP(args) != IS_ARRAY) {
- convert_to_array_ex(args);
- }
- zend_hash_next_index_insert(HASH_OF(*args), (void
*)&val, sizeof(zval *), NULL);
+ optname_len = strlen(optname);
+ if (!(optname_len > 1 && optname[0] == '0') &&
is_numeric_string(optname, optname_len, NULL, NULL, 0) == IS_LONG) {
+ /* numeric string */
+ int optname_int = atoi(optname);
+ if(zend_hash_index_find(HASH_OF(return_value),
optname_int, (void **)&args) != FAILURE) {
+ if(Z_TYPE_PP(args) != IS_ARRAY) {
+ convert_to_array_ex(args);
+ }
+ zend_hash_next_index_insert(HASH_OF(*args),
(void *)&val, sizeof(zval *), NULL);
+ } else {
+ zend_hash_index_update(HASH_OF(return_value),
optname_int, &val, sizeof(zval *), NULL);
+ }
} else {
- zend_hash_add(HASH_OF(return_value), optname,
strlen(optname)+1, (void *)&val,
- sizeof(zval *), NULL);
+ /* other strings */
+ if(zend_hash_find(HASH_OF(return_value), optname,
strlen(optname)+1, (void **)&args) != FAILURE) {
+ if(Z_TYPE_PP(args) != IS_ARRAY) {
+ convert_to_array_ex(args);
+ }
+ zend_hash_next_index_insert(HASH_OF(*args),
(void *)&val, sizeof(zval *), NULL);
+ } else {
+ zend_hash_add(HASH_OF(return_value), optname,
strlen(optname)+1, (void *)&val, sizeof(zval *), NULL);
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
