From: Pierre Joye <pajoye@php.net>
Date: Fri, 13 Jan 2006 04:10:32 +0000 (+0000)
Subject: - MFB: add php_mkdir_ex
X-Git-Tag: RELEASE_1_0_4~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7772d520349ba6d6f70a431528573b3ea7df84b;p=php

- MFB: add php_mkdir_ex
---

diff --git a/ext/standard/file.c b/ext/standard/file.c
index b46aa9cf32..bf8ef1aad2 100644
--- a/ext/standard/file.c
+++ b/ext/standard/file.c
@@ -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);
 }
 /* }}} */
 
diff --git a/ext/standard/file.h b/ext/standard/file.h
index 7a8f182d28..2d3afb1214 100644
--- a/ext/standard/file.h
+++ b/ext/standard/file.h
@@ -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