cvs: php-src(PHP_4_4) /ext/standard file.c

tony2001 Tue Mar 28 09:46:35 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/ext/standard file.c Log: fix build and #36887 http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/file.c?r1=1.279.2.70.2.5&r2=1.279.2.70.2.6&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.279.2.70.2.5 php-src/ext/standard/file.c:1.279.2.70.2.6 --- php-src/ext/standard/file.c:1.279.2.70.2.5 Mon Mar 27 23:42:22 2006 +++ php-src/ext/standard/file.c Tue Mar 28 09:46:35 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.279.2.70.2.5 2006/03/27 23:42:22 iliaa Exp $ */ +/* $Id: file.c,v 1.279.2.70.2.6 2006/03/28 09:46:35 tony2001 Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -554,7 +554,6 @@ char *opened_path; char *p; FILE *fp; - size_t p_len; if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { WRONG_PARAM_COUNT; @@ -568,8 +567,8 @@ d = estrndup(Z_STRVAL_PP(arg1), Z_STRLEN_PP(arg1)); - php_basename(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2), NULL, 0, &p, &p_len TSRMLS_CC); - if (p_len > 64) { + p = php_basename(Z_STRVAL_PP(arg2), Z_STRLEN_PP(arg2), NULL, 0); + if (strlen(p) > 64) { p[63] = '\0'; }