- MFB: add php_mkdir_ex

This commit is contained in:
Pierre Joye 2006-01-13 04:10:32 +00:00
parent 18d36265fd
commit d7772d5203
2 changed files with 10 additions and 4 deletions

View file

@ -1408,10 +1408,10 @@ PHPAPI PHP_FUNCTION(fseek)
/* {{{ proto int mkdir(char *dir int mode)
*/
PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC)
PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC)
{
int ret;
if (PG(safe_mode) && (!php_checkuid(dir, NULL, CHECKUID_CHECK_FILE_AND_DIR))) {
return -1;
}
@ -1420,11 +1420,16 @@ PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC)
return -1;
}
if ((ret = VCWD_MKDIR(dir, (mode_t)mode)) < 0) {
if ((ret = VCWD_MKDIR(dir, (mode_t)mode)) < 0 && (options & REPORT_ERRORS) == 1) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "%s", strerror(errno));
}
return ret;
return ret;
}
PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC)
{
return php_mkdir_ex(dir, mode, REPORT_ERRORS TSRMLS_CC);
}
/* }}} */

View file

@ -72,6 +72,7 @@ PHP_MINIT_FUNCTION(user_streams);
PHPAPI int php_le_stream_context(void);
PHPAPI int php_set_sock_blocking(int socketd, int block TSRMLS_DC);
PHPAPI int php_copy_file(char *src, char *dest TSRMLS_DC);
PHPAPI int php_mkdir_ex(char *dir, long mode, int options TSRMLS_DC);
PHPAPI int php_mkdir(char *dir, long mode TSRMLS_DC);
#define META_DEF_BUFSIZE 8192