Implement stream_vt100_support user function #2103
Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support
- Loading branch information
commit d15063c9e2bcc3d9c1dafe01d248e247900fbb82
8000
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -1636,10 +1636,60 @@ PHP_FUNCTION(stream_supports_lock) | |
| RETURN_TRUE; | ||
| } | ||
|
|
||
| /* {{{ proto proto stream_isatty(resource stream) | ||
| Check if a stream is a TTY. | ||
| */ | ||
| PHP_FUNCTION(stream_isatty) | ||
| { | ||
| zval *zsrc; | ||
| php_stream *stream; | ||
| zend_long fileno; | ||
|
|
||
| int argc = ZEND_NUM_ARGS(); | ||
|
|
||
| if (zend_parse_parameters(argc, "r", &zsrc) == FAILURE) { | ||
| RETURN_FALSE; | ||
| } | ||
|
|
||
| php_stream_from_zval(stream, zsrc); | ||
|
|
||
| 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; | ||
| } | ||
|
|
||
| #ifdef PHP_WIN32 | ||
| /* Check if the Windows standard handle is redirected to file */ | ||
|
There was a problem hiding this comment. May be There was a problem hiding this comment. Much better: e4aaa27 |
||
| if (php_win32_console_fileno_is_console(fileno)) { | ||
| 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 | ||
| } | ||
|
|
||
| #ifdef PHP_WIN32 | ||
| /* {{{ proto proto sapi_windows_vt100_support(resource stream[, bool enable]) | ||
| Get or set VT100 support for the specified stream associated to an | ||
| output buffer of a Windows console. | ||
| */ | ||
| PHP_FUNCTION(sapi_windows_vt100_support) | ||
| { | ||
| zval *zsrc; | ||
| php_stream *stream; | ||
|
|
@@ -1669,51 +1719,31 @@ PHP_FUNCTION(stream_vt100_support) | |
| RETURN_FALSE; | ||
| } | ||
|
|
||
| /* Check if the Windows standard handle is redirected to file */ | ||
| if (!php_win32_console_fileno_is_console(fileno)) { | ||
| RETURN_FALSE; | ||
| } | ||
|
|
||
| if (argc == 1) { | ||
| /* Check if the Windows standard handle has VT100 control codes enabled */ | ||
| if (php_win32_console_fileno_has_vt100(fileno)) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| } | ||
| else { | ||
| /* Enable/disable VT100 control codes support for the specified Windows standard handle */ | ||
| if (php_win32_console_fileno_set_vt100(fileno, enable ? TRUE : FALSE)) { | ||
| RETURN_TRUE; | ||
| } | ||
| else { | ||
| RETURN_FALSE; | ||
| } | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| #ifdef HAVE_SHUTDOWN | ||
| /* {{{ proto int stream_socket_shutdown(resource stream, int how) | ||
|
|
||
This file contains hidden or 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
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