cvs: php-src /ext/standard basic_functions.c

andrei Fri Jan 5 18:50:46 2007 UTC Modified files: /php-src/ext/standard basic_functions.c Log: Clean up set_include_path(). http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.844&r2=1.845&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.844 php-src/ext/standard/basic_functions.c:1.845 --- php-src/ext/standard/basic_functions.c:1.844 Mon Jan 1 09:29:30 2007 +++ php-src/ext/standard/basic_functions.c Fri Jan 5 18:50:46 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.844 2007/01/01 09:29:30 sebastian Exp $ */ +/* $Id: basic_functions.c,v 1.845 2007/01/05 18:50:46 andrei Exp $ */ #include "php.h" #include "php_streams.h" @@ -5783,15 +5783,16 @@ new_value_len = temp_len; free_new_value = 1; } else if (UG(unicode)) { - const char *conv_name; UErrorCode status = U_ZERO_ERROR; - conv_name = ucnv_getName(ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &status); - conv_name = ucnv_getStandardName(conv_name, "MIME", &status); - if (strcmp(conv_name, "UTF-8") != 0) { - status = U_ZERO_ERROR; + if (ucnv_getType(ZEND_U_CONVERTER(UG(filesystem_encoding_conv))) != UCNV_UTF8) { zend_convert_encodings(UG(utf8_conv), ZEND_U_CONVERTER(UG(filesystem_encoding_conv)), &temp, &temp_len, new_value.s, new_value_len, &status); + if (U_FAILURE(status)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not convert path parameter from filesystem encoding to UTF-8"); + zval_dtor(return_value); + RETURN_FALSE; + } new_value.s = temp; new_value_len = temp_len; free_new_value = 1;