diff options
| author | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:50:20 +0200 |
|---|---|---|
| committer | Pierre Joye <pierre.php@gmail.com> | 2014-05-13 06:50:20 +0200 |
| commit | dbc6d0df844fc72c8bc44cc1b639d105619d5131 (patch) | |
| tree | 059b88153f16e0e31381edaf0febbdf2eaa39dcb /ext/standard/proc_open.c | |
| parent | 7a74d779aa86a1d95692b145a60f6befccfa9c5a (diff) | |
| download | php-git-dbc6d0df844fc72c8bc44cc1b639d105619d5131.tar.gz | |
port proc_open to windows (untested yet)
Diffstat (limited to 'ext/standard/proc_open.c')
| -rw-r--r-- | ext/standard/proc_open.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c index 39dab2021a..4185da9df6 100644 --- a/ext/standard/proc_open.c +++ b/ext/standard/proc_open.c @@ -469,16 +469,16 @@ PHP_FUNCTION(proc_open) #ifdef PHP_WIN32 if (other_options) { - zval **item; - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(other_options), "suppress_errors", sizeof("suppress_errors"), (void**)&item)) { - if ((Z_TYPE_PP(item) == IS_BOOL || Z_TYPE_PP(item) == IS_LONG) && - Z_LVAL_PP(item)) { + zval *item = zend_hash_str_find(Z_ARRVAL_P(other_options), "suppress_errors", sizeof("suppress_errors")); + if (item != NULL) { + if (Z_TYPE_P(item) == IS_TRUE || ((Z_TYPE_P(item) == IS_LONG) && Z_LVAL_P(item))) { suppress_errors = 1; } } - if (SUCCESS == zend_hash_find(Z_ARRVAL_P(other_options), "bypass_shell", sizeof("bypass_shell"), (void**)&item)) { - if ((Z_TYPE_PP(item) == IS_BOOL || Z_TYPE_PP(item) == IS_LONG) && - Z_LVAL_PP(item)) { + + item = zend_hash_str_find(Z_ARRVAL_P(other_options), "bypass_shell", sizeof("bypass_shell")); + if (item != NULL) { + if (Z_TYPE_P(item) == IS_TRUE || ((Z_TYPE_P(item) == IS_LONG) && Z_LVAL_P(item))) { bypass_shell = 1; } } @@ -626,7 +626,7 @@ PHP_FUNCTION(proc_open) /* simulate the append mode by fseeking to the end of the file this introduces a potential race-condition, but it is the best we can do, though */ - if (strchr(Z_STRVAL_PP(zmode), 'a')) { + if (strchr(Z_STRVAL_P(zmode), 'a')) { SetFilePointer(descriptors[ndesc].childend, 0, NULL, FILE_END); } #else |