diff options
| author | Felipe Pena <felipe@php.net> | 2011-06-06 21:28:16 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-06-06 21:28:16 +0000 |
| commit | 32b5f8a1a3552f48d6e91c17b6d9d441c665a44d (patch) | |
| tree | a6490eaed671ea190f7876994b35169200ff2df8 /ext/standard/dir.c | |
| parent | a311dc244353f0ed88a273056224ee5c97cc4011 (diff) | |
| download | php-git-32b5f8a1a3552f48d6e91c17b6d9d441c665a44d.tar.gz | |
- Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
Diffstat (limited to 'ext/standard/dir.c')
| -rw-r--r-- | ext/standard/dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/standard/dir.c b/ext/standard/dir.c index 284553beaf..746cd8e238 100644 --- a/ext/standard/dir.c +++ b/ext/standard/dir.c @@ -325,7 +325,7 @@ PHP_FUNCTION(chdir) char *str; int ret, str_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p", &str, &str_len) == FAILURE) { RETURN_FALSE; } @@ -436,7 +436,7 @@ PHP_FUNCTION(glob) int ret; zend_bool basedir_limit = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &pattern, &pattern_len, &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|l", &pattern, &pattern_len, &flags) == FAILURE) { return; } @@ -554,7 +554,7 @@ PHP_FUNCTION(scandir) zval *zcontext = NULL; php_stream_context *context = NULL; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lr", &dirn, &dirn_len, &flags, &zcontext) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "p|lr", &dirn, &dirn_len, &flags, &zcontext) == FAILURE) { return; } |