From 6c509aa8378a28db46d4078153b83e4f4fc042a7 Mon Sep 17 00:00:00 2001 From: Pierre Joye Date: Fri, 13 Jan 2006 04:06:00 +0000 Subject: [PATCH] - add php_mkdir_ex, works like php_mkdir but allows to silent any error when no options are used --- NEWS | 3 ++- ext/standard/file.c | 13 +++++++++---- ext/standard/file.h | 1 + 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 675143dad2..61990c1d4a 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,8 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2006, PHP 5.1.3 - +- Added intern function php_mkdir_ex, works like php_mkdir but supports + the streams options (only REPORT_ERRORS is used) (Pierre) 12 Jan 2006, PHP 5.1.2 - Updated libsqlite in ext/sqlite to 2.8.17. (Ilia) - Updated libsqlite in ext/pdo_sqlite to 3.2.8. (Ilia) diff --git a/ext/standard/file.c b/ext/standard/file.c index de8de43206..cd8f666335 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1355,10 +1355,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; } @@ -1367,11 +1367,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)) { 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 e34ef4d708..099a6ddbcc 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 -- 2.50.1