laruence Wed, 21 Sep 2011 06:59:47 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317078
Log: Remove double checking, and use MAXPATHLEN instead of a fixed length Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c U php/php-src/trunk/sapi/cli/php_cli_server.c Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-21 05:20:12 UTC (rev 317077) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-09-21 06:59:47 UTC (rev 317078) @@ -1880,17 +1880,12 @@ } { zend_file_handle zfd; -#if HAVE_BROKEN_GETCWD - int old_cwd_fd = -1; - old_cwd_fd = open(".", 0); -#else char *old_cwd; + ALLOCA_FLAG(use_heap) -#define OLD_CWD_SIZE 4096 - old_cwd = do_alloca(OLD_CWD_SIZE, use_heap); + old_cwd = do_alloca(MAXPATHLEN, use_heap); old_cwd[0] = '\0'; - php_ignore_value(VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1)); -#endif + php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1)); zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = server->router; @@ -1910,17 +1905,11 @@ } } zend_end_try(); -#if HAVE_BROKEN_GETCWD - if (old_cwd_fd != -1) { - fchdir(old_cwd_fd); - close(old_cwd_fd); - } -#else if (old_cwd[0] != '\0') { php_ignore_value(VCWD_CHDIR(old_cwd)); } + free_alloca(old_cwd, use_heap); -#endif } if (decline) { Modified: php/php-src/trunk/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-21 05:20:12 UTC (rev 317077) +++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-09-21 06:59:47 UTC (rev 317078) @@ -1880,17 +1880,12 @@ } { zend_file_handle zfd; -#if HAVE_BROKEN_GETCWD - int old_cwd_fd = -1; - old_cwd_fd = open(".", 0); -#else char *old_cwd; + ALLOCA_FLAG(use_heap) -#define OLD_CWD_SIZE 4096 - old_cwd = do_alloca(OLD_CWD_SIZE, use_heap); + old_cwd = do_alloca(MAXPATHLEN, use_heap); old_cwd[0] = '\0'; - php_ignore_value(VCWD_GETCWD(old_cwd, OLD_CWD_SIZE-1)); -#endif + php_ignore_value(VCWD_GETCWD(old_cwd, MAXPATHLEN - 1)); zfd.type = ZEND_HANDLE_FILENAME; zfd.filename = server->router; @@ -1910,17 +1905,11 @@ } } zend_end_try(); -#if HAVE_BROKEN_GETCWD - if (old_cwd_fd != -1) { - fchdir(old_cwd_fd); - close(old_cwd_fd); - } -#else if (old_cwd[0] != '\0') { php_ignore_value(VCWD_CHDIR(old_cwd)); } + free_alloca(old_cwd, use_heap); -#endif } if (decline) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php