Implement stream_vt100_support user function #2103
There are no files selected for viewing
| 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,121 @@ 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 | ||
| zend_stat_t stat; | ||
| if (zend_fstat(fileno, &stat) == 0) { | ||
| if ((stat.st_mode & /*S_IFMT*/0170000) == /*S_IFCHR*/0020000) { | ||
| RETURN_TRUE; | ||
| } | ||
| } | ||
| RETURN_NULL(); | ||
| #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; | ||
| zend_bool enable; | ||
| zend_long fileno; | ||
|
|
||
| int argc = ZEND_NUM_ARGS(); | ||
|
|
||
| if (zend_parse_parameters(argc, "r|b", &zsrc, &enable) == 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); | ||
| } | ||
| else if (php_stream_can_cast(stream, PHP_STREAM_AS_FD) == SUCCESS) { | ||
| php_stream_cast(stream, PHP_STREAM_AS_FD, (void*)&fileno, 0); | ||
| } | ||
| else { | ||
| zend_internal_type_error( | ||
| ZEND_ARG_USES_STRICT_TYPES(), | ||
| "%s() was not able to analyze the specified stream", | ||
| get_active_function_name() | ||
| ); | ||
| 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) | ||
| causes all or part of a full-duplex connection on the socket associated | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,7 @@ | |
| #ifdef PHP_WIN32 | ||
| #include "win32/time.h" | ||
| #include "win32/signal.h" | ||
| #include "win32/console.h" | ||
| #include <process.h> | ||
| #include <shellapi.h> | ||
| #endif | ||
|
|
@@ -243,6 +244,9 @@ static void print_extensions(void) /* {{{ */ | |
| #ifndef STDOUT_FILENO | ||
| #define STDOUT_FILENO 1 | ||
| #endif | ||
| #ifndef STDERR_FILENO | ||
| #define STDERR_FILENO 2 | ||
| #endif | ||
|
|
||
| static inline int sapi_cli_select(int fd) | ||
| { | ||
|
|
@@ -1208,6 +1212,11 @@ int main(int argc, char *argv[]) | |
| */ | ||
| argv = save_ps_args(argc, argv); | ||
|
|
||
| #ifdef PHP_WIN32 | ||
|
There was a problem hiding this comment. This also needs an Maybe it is worth incorporating a few lines down in the There was a problem hiding this comment.
I don't know PHP internals that much, but a 3rd party app could attach a console to a php.exe compiled with PHP_CLI_WIN32_NO_CONSOLE? There was a problem hiding this comment.
Why? There was a problem hiding this comment. Perhaps (why would you do that?), but I was basing this on the fact that the new codepage stuff uses this guard. Also, There was a problem hiding this comment. Re setmode() - I meant in the block of code that calls setmode, just to keep the There was a problem hiding this comment.
They have different and unrelated purposes, I don't see why we have the necessity to keep them together. There was a problem hiding this comment. PHP_CLI_WIN32_NO_CONSOLE builds a binary without any interaction, which is meant to be run a a service for example. You can check sapi/cli/config.w32. Though i'm not sure how often this feature is actually used, I don't recall any related bug reports within last couple of years. Anyway there is supposed to be no console interaction. Except maybe that the service is allowed to communicate with desktop, but even in that case - wouldn't the descriptors be redirected? Thanks. There was a problem hiding this comment.
I guess so... d1772e6 |
||
| php_win32_console_fileno_set_vt100(STDOUT_FILENO, TRUE); | ||
| php_win32_console_fileno_set_vt100(STDERR_FILENO, TRUE); | ||
| #endif | ||
|
|
||
| cli_sapi_module.additional_functions = additional_functions; | ||
|
|
||
| #if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP) | ||
|
|
||
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