Implement stream_vt100_support user function #2103
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,6 +37,7 @@ typedef unsigned long long php_timeout_ull; | |
| #else | ||
| #include "win32/select.h" | ||
| #include "win32/sockets.h" | ||
| #include "win32/console.h" | ||
| typedef unsigned __int64 php_timeout_ull; | ||
| #endif | ||
|
|
||
|
|
@@ -1635,6 +1636,127 @@ PHP_FUNCTION(stream_supports_lock) | |
| RETURN_TRUE; | ||
| } | ||
|
|
||
| /* {{{ proto proto stream_vt100_support(resource stream[, bool enable]) | ||
| Get or set VT100 support for the specified stream. | ||
| */ | ||
| PHP_FUNCTION(stream_vt100_support) | ||
| { | ||
| zval *z_stream; | ||
| php_stream *stream; | ||
| int fileno; | ||
| zend_bool enable; | ||
| #ifdef PHP_WIN32 | ||
| DWORD handle_id; | ||
| #endif | ||
| int argc = ZEND_NUM_ARGS(); | ||
|
|
||
| if (zend_parse_parameters(argc, "z|b", &z_stream, &enable) == FAILURE) { | ||
| return; | ||
| } | ||
| stream = NULL; | ||
| switch (Z_TYPE_P(z_stream)) { | ||
| case IS_RESOURCE: | ||
| php_stream_from_zval_no_verify(stream, z_stream); | ||
| break; | ||
| } | ||
| if (stream == NULL) { | ||
| RETURN_FALSE; | ||
| } | ||
| if (php_stream_can_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT) == SUCCESS) { | ||
| php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT, (void*)&fileno, 0); | ||
|
There was a problem hiding this comment. The void* cast will cause the stack corruption on 64-bit. There was a problem hiding this comment.
Fixed in 694e207 |
||
| } else if (php_stream_can_cast(stream, PHP_STREAM_AS_FD) == SUCCESS) { | ||
| php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fileno, 0); | ||
| } else { | ||
| RETURN_FALSE; | ||
| } | ||
| switch (fileno) { | ||
| case STDOUT_FILENO: | ||
| #ifdef PHP_WIN32 | ||
| handle_id = STD_OUTPUT_HANDLE; | ||
| #endif | ||
| break; | ||
| case STDERR_FILENO: | ||
| #ifdef PHP_WIN32 | ||
| handle_id = STD_ERROR_HANDLE; | ||
| #endif | ||
| break; | ||
| default: | ||
| RETURN_FALSE; | ||
| } | ||
|
|
||
|
|
||
| if (argc == 1) { | ||
| /* Check if the specified stream supports VT100 control codes */ | ||
| #ifdef PHP_WIN32 | ||
| /* Check if the current Windows version supports VT100 control codes */ | ||
| if (!php_win32_console_os_supports_vt100()) { | ||
| RETURN_FALSE; | ||
| } | ||
| /* Check if the Windows standard handle is redirected to file */ | ||
| if (php_win32_console_handle_is_redirected(handle_id)) { | ||
| RETURN_FALSE; | ||
| } | ||
| /* Check if the Windows standard handle has VT100 control codes enabled */ | ||
| if (php_win32_console_handle_has_vt100(handle_id)) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| #elif HAVE_POSIX | ||
| /* Check if the file descriptor identifier is a terminal */ | ||
| if (isatty(fileno)) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| #else | ||
| RETURN_FALSE; | ||
| #endif | ||
| } | ||
| else { | ||
| /* Enable/disable VT100 control codes support for the specified stream */ | ||
| #ifdef PHP_WIN32 | ||
| /* Check if the current Windows version supports VT100 control codes */ | ||
| if (!php_win32_console_os_supports_vt100()) { | ||
| RETURN_FALSE; | ||
| } | ||
| /* Check if the Windows standard handle is redirected to file */ | ||
| if (php_win32_console_handle_is_redirected(handle_id)) { | ||
| RETURN_FALSE; | ||
| } | ||
| /* Enable/disable VT100 control codes support for the specified Windows standard handle */ | ||
| if (php_win32_console_handle_set_vt100(handle_id, enable ? TRUE : FALSE)) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| #elif HAVE_POSIX | ||
| /* Check if the file descriptor identifier is a terminal */ | ||
| if (isatty(fileno)) { | ||
| if (enable) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| } | ||
| else { | ||
| if (enable) { | ||
| RETURN_FALSE; | ||
| } | ||
| else { | ||
| RETURN_TRUE; | ||
| } | ||
| } | ||
| #else | ||
| RETURN_FALSE; | ||
| #endif | ||
| } | ||
| } | ||
|
|
||
| #ifdef HAVE_SHUTDOWN | ||
| /* {{{ proto int stream_socket_shutdown(resource stream, int how) | ||
| causes all or part of a full-duplex connection on the socket associated | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| --TEST-- | ||
| Test stream_vt100_support on POSIX with redirected STDERR | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!function_exists('posix_isatty')) { | ||
| echo "skip Only for POSIX systems"; | ||
| } | ||
| ?> | ||
| --CAPTURE_STDIO-- | ||
| STDERR | ||
| --FILE-- | ||
| <?php | ||
| ob_start(); | ||
| var_dump(stream_vt100_support(STDOUT)); | ||
| var_dump(stream_vt100_support(STDERR)); | ||
| $content = ob_get_clean(); | ||
| fwrite(STDERR, $content); | ||
| ?> | ||
| --EXPECT-- | ||
| bool(true) | ||
| bool(false) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| --TEST-- | ||
| Test stream_vt100_support on POSIX with redirected STDOUT | ||
| --SKIPIF-- | ||
| <?php | ||
| if (!function_exists('posix_isatty')) { | ||
| echo "skip Only for POSIX systems"; | ||
| } | ||
| ?> | ||
| --CAPTURE_STDIO-- | ||
| STDOUT | ||
| --FILE-- | ||
| <?php | ||
| var_dump(stream_vt100_support(STDOUT)); | ||
| var_dump(stream_vt100_support(STDERR)); | ||
| ?> | ||
| --EXPECT-- | ||
| bool(false) | ||
| bool(true) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| --TEST-- | ||
| Test stream_vt100_support on newer Windows versions with redirected STDIO/STDERR | ||
| --SKIPIF-- | ||
| <?php | ||
| if (stripos(PHP_OS, 'WIN') !== 0) { | ||
| echo "skip Only for Windows systems"; | ||
| } elseif (version_compare( | ||
| PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, | ||
| '10.0.10586' | ||
| ) < 0) { | ||
| echo "skip Only for Windows systems >= 10.0.10586"; | ||
| } | ||
| ?> | ||
| --CAPTURE_STDIO-- | ||
| STDOUT, STDERR | ||
| --FILE-- | ||
| <?php | ||
| var_dump(stream_vt100_support(STDOUT, true)); | ||
| var_dump(stream_vt100_support(STDERR, true)); | ||
| stream_vt100_support(STDOUT, false); | ||
| stream_vt100_support(STDERR, false); | ||
| ?> | ||
| --EXPECT-- | ||
| bool(false) | ||
| bool(false) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| --TEST-- | ||
| Test stream_vt100_support for STDERR on newer Windows versions | ||
| --SKIPIF-- | ||
| <?php | ||
| if (stripos(PHP_OS, 'WIN') !== 0) { | ||
| echo "skip Only for Windows systems"; | ||
| } elseif (version_compare( | ||
| PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD, | ||
| '10.0.10586' | ||
| ) < 0) { | ||
| echo "skip Only for Windows systems >= 10.0.10586"; | ||
| } | ||
| ?> | ||
| --CAPTURE_STDIO-- | ||
| STDOUT | ||
| --FILE-- | ||
| <?php | ||
| var_dump(stream_vt100_support(STDERR, true)); | ||
| var_dump(stream_vt100_support(STDERR)); | ||
| var_dump(stream_vt100_support(STDERR, false)); | ||
| var_dump(stream_vt100_support(STDERR)); | ||
| ?> | ||
| --EXPECT-- | ||
| bool(true) | ||
| bool(true) | ||
| bool(true) | ||
| bool(false) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You only use this in the call to
zend_parse_parametersnowThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 1081aa8