cvs: php4 /ext/standard file.c

mfischer Fri Jan 11 05:44:24 2002 EDT Modified files: /php4/ext/standard file.c Log: - mkdir(): made second (mode) parameter optional, default to 0777 switched to zend_parse_parameters(). # Added vim 'noet' setting Index: php4/ext/standard/file.c diff -u php4/ext/standard/file.c:1.203 php4/ext/standard/file.c:1.204 --- php4/ext/standard/file.c:1.203 Fri Dec 21 03:04:21 2001 +++ php4/ext/standard/file.c Fri Jan 11 05:44:24 2002 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.203 2001/12/21 08:04:21 derick Exp $ */ +/* $Id: file.c,v 1.204 2002/01/11 10:44:24 mfischer Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -1447,32 +1447,28 @@ } /* }}} */ -/* {{{ proto bool mkdir(string pathname, int mode) +/* {{{ proto bool mkdir(string pathname[, int mode]) Create a directory */ PHP_FUNCTION(mkdir) { - zval **arg1, **arg2; - int ret; - mode_t mode; + int dir_len, ret; + mode_t mode = 0777; + char *dir; - if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &arg1, &arg2) == FAILURE) { - WRONG_PARAM_COUNT; + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &dir, &dir_len, &mode) == FAILURE) { + return; } - convert_to_string_ex(arg1); - convert_to_long_ex(arg2); - mode = (mode_t) Z_LVAL_PP(arg2); - - if (PG(safe_mode) &&(!php_checkuid(Z_STRVAL_PP(arg1), NULL, CHECKUID_ALLOW_ONLY_DIR))) { + if (PG(safe_mode) &&(!php_checkuid(dir, NULL, CHECKUID_ALLOW_ONLY_DIR))) { RETURN_FALSE; } - if (php_check_open_basedir(Z_STRVAL_PP(arg1) TSRMLS_CC)) { + if (php_check_open_basedir(dir TSRMLS_CC)) { RETURN_FALSE; } - ret = VCWD_MKDIR(Z_STRVAL_PP(arg1), mode); + ret = VCWD_MKDIR(dir, mode); if (ret < 0) { php_error(E_WARNING, "mkdir() failed (%s)", strerror(errno)); RETURN_FALSE; @@ -2354,6 +2350,6 @@ * tab-width: 4 * c-basic-offset: 4 * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 */