8000 Implement stream_vt100_support user function by mlocati · Pull Request #2103 · php/php-src · GitHub
[go: up one dir, main page]
Skip to content

Implement stream_vt100_support user function #2103

New iss 8000 ue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 41 commits into from
Closed

Implement stream_vt100_support user function #2103

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
a0e0d8d
Add VT100 support for Windows
mlocati Aug 29, 2016
18c5c42
Fix function names prefix
mlocati Aug 30, 2016
be50062
Use Unicode version of GetFinalPathNameByHandle
mlocati Aug 30, 2016
e11f3d2
Use EG(windows_version_info) instead of RtlGetVersion
mlocati Aug 30, 2016
6953d2f
Use the specified handle_id instead of STD_OUTPUT_HANDLE
mlocati Aug 30, 2016
bd93781
Switch from stream name to stream resource
mlocati Aug 30, 2016
35bf19a
Allow running tests capturing only stdout and/or stderr
mlocati Aug 30, 2016
d9b1c99
Add tests for stream_vt100_support function
mlocati Aug 30, 2016
2f05643
Export Win32 console functions
mlocati Oct 4, 2016
694e207
Fix x64 build
mlocati Oct 4, 2016
4f4ffd0
Use zend_long instead of long long, use GetConsole instead of GetFina…
mlocati Oct 4, 2016
3fcdc64
Always use zend_long on any platform
mlocati Oct 4, 2016
99bd01e
Use _get_osfhandle to determine the standard handle
mlocati Oct 5, 2016
7b155f4
Accept stream names
mlocati Oct 5, 2016
08e75a2
Raise warnings in case of invalid stream parameter
mlocati Oct 5, 2016
c10467e
Return true if disabling VT100 support on a not-console/redirected st…
mlocati Oct 6, 2016
dd85825
Remove php_win32_console_os_supports_vt100
mlocati Oct 6, 2016
a6e88f6
8000 Differentiate stdin vs stdout/stderr
mlocati Oct 6, 2016
1643715
Simplify setting flag
mlocati Oct 6, 2016
f86567e
Allow avoid piping STDIN
mlocati Oct 6, 2016
658ff84
Let stream_vt100_support accept only resources
mlocati Oct 6, 2016
d9e0531
Fix run-tests
mlocati Oct 6, 2016
157f8e8
Revert console flags in case of failure
mlocati Oct 6, 2016
76411a4
Simplify logic of stream_vt100_support when setting the flag
mlocati Oct 7, 2016
4d956f2
Drop support for STDIN
mlocati Oct 7, 2016
7d348a0
More comprehensive tests for stream_vt100_support
mlocati Oct 7, 2016
4588b50
Remove old tests
mlocati Oct 8, 2016
bf60a78
Fix name of included file and use absolute paths
mlocati Oct 8, 2016
5d2ecf9
Enable ENABLE_VIRTUAL_TERMINAL_PROCESSING on Windows by default
mlocati Oct 8, 2016
7581767
Remove tests for stream_vt100_support
mlocati Oct 9, 2016
d15063c
Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support
mlocati Oct 9, 2016
65ad779
Add tests for stream_isatty
mlocati Oct 9, 2016
67e1eb7
Add tests for sapi_windows_vt100_support
mlocati Oct 9, 2016
f9ff470
Return null from stream_isatty is neither Windows nor Posix
mlocati Oct 14, 2016
6df8c3c
Fallback to S_ISCHR if neither Windows nor Posix
mlocati Oct 14, 2016
1081aa8
Avoid defining argc since it's only used once
mlocati Oct 17, 2016
e4aaa27
Better comment about php_win32_console_fileno_is_console
mlocati Oct 17, 2016
2d062f3
Use events instead of cNumberOfEvents
mlocati Oct 17, 2016
d70a7f2
Do not restore previous console mode
mlocati Oct 17, 2016
c2988ea
Merge master into vt100-windows
mlocati Oct 17, 2016
d1772e6
Don't configure STDOUT/STDERR on Windows with PHP_CLI_WIN32_NO_CONSOLE
mlocati Oct 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use _get_osfhandle to determine the standard handle
  • Loading branch information
@mlocati
mlocati committed Oct 5, 2016
commit 99bd01e53d780ccc4b24c7e9c744878adee0eeb4
25 changes: 4 additions & 21 deletions ext/standard/streamsfuncs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1645,9 +1645,6 @@ PHP_FUNCTION(stream_vt100_support)
php_stream *stream;
zend_long fileno;
zend_bool enable;
#ifdef PHP_WIN32
DWORD handle_id;
#endif
int argc = ZEND_NUM_ARGS();
Copy link
Contributor

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_parameters now

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 1081aa8


if (zend_parse_parameters(argc, "z|b", &z_stream, &enable) == FAILURE) {
Expand All @@ -1669,20 +1666,6 @@ PHP_FUNCTION(stream_vt100_support)
} 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) {
Expand All @@ -1693,11 +1676,11 @@ PHP_FUNCTION(stream_vt100_support)
RETURN_FALSE;
}
/* Check if the Windows standard handle is redirected to file */
if (!php_win32_console_handle_is_console(handle_id)) {
if (!php_win32_console_fileno_is_console(fileno)) {
RETURN_FALSE;
}
/* Check if the Windows standard handle has VT100 control codes enabled */
if (php_win32_console_handle_has_vt100(handle_id)) {
if (php_win32_console_fileno_has_vt100(fileno)) {
RETURN_TRUE;
}
else {
Expand All @@ -1723,11 +1706,11 @@ PHP_FUNCTION(stream_vt100_support)
RETURN_FALSE;
}
/* Check if the Windows standard handle is redirected to file */
if (!php_win32_console_handle_is_console(handle_id)) {
if (!php_win32_console_fileno_is_console(fileno)) {
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)) {
if (php_win32_console_fileno_set_vt100(fileno, enable ? TRUE : FALSE)) {
RETURN_TRUE;
}
else {
Expand Down
12 changes: 6 additions & 6 deletions win32/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ PHP_WINUTIL_API BOOL php_win32_console_os_supports_vt100()
}

PHP_WINUTIL_API BOOL php_win32_console_handle_is_console(DWORD handle_id)
PHP_WINUTIL_API BOOL php_win32_console_fileno_is_console(zend_long fileno)
{
BOOL result = FALSE;
HANDLE handle = handle_id ? GetStdHandle(handle_id) : INVALID_HANDLE_VALUE;
HANDLE handle = (HANDLE) _get_osfhandle(fileno);

if (handle != INVALID_HANDLE_VALUE) {
DWORD mode;
Expand All @@ -67,10 +67,10 @@ PHP_WINUTIL_API BOOL php_win32_console_handle_is_console(DWORD handle_id)
return result;
}

PHP_WINUTIL_API BOOL php_win32_console_handle_has_vt100(DWORD handle_id)
PHP_WINUTIL_API BOOL php_win32_console_fileno_has_vt100(zend_long fileno)
{
BOOL result = FALSE;
HANDLE handle = handle_id ? GetStdHandle(handle_id) : INVALID_HANDLE_VALUE;
HANDLE handle = (HANDLE) _get_osfhandle(fileno);

if (handle != INVALID_HANDLE_VALUE) {
DWORD mode;
Expand All @@ -84,10 +84,10 @@ PHP_WINUTIL_API BOOL php_win32_console_handle_has_vt100(DWORD handle_id)
return result;
}

PHP_WINUTIL_API BOOL php_win32_console_handle_set_vt100(DWORD handle_id, BOOL enable)
PHP_WINUTIL_API BOOL php_win32_console_fileno_set_vt100(zend_long fileno, BOOL enable)
{
BOOL result = FALSE;
HANDLE handle = handle_id ? GetStdHandle(handle_id) : INVALID_HANDLE_VALUE;
HANDLE handle = (HANDLE) _get_osfhandle(fileno);

if (handle != INVALID_HANDLE_VALUE) {
DWORD mode;
Expand Down
30 changes: 18 additions & 12 deletions win32/console.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,27 @@
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
#endif

/* Check if the current Windows version supports VT100 control codes */
/*
Check if the current Windows version supports VT100 control codes
*/
PHP_WINUTIL_API BOOL php_win32_console_os_supports_vt100();

/* Check if the standard handle (STD_OUTPUT_HANDLE, STD_ERROR_HANDLE)
is a console (valid handle_id, neither redirected nor piped) */
PHP_WINUTIL_API BOOL php_win32_console_handle_is_console(DWORD handle_id);
/*
Check if a file descriptor associated to a stream is a console
(valid fileno, neither redirected nor piped)
*/
PHP_WINUTIL_API BOOL php_win32_console_fileno_is_console(zend_long fileno);

/* Check if the console attached to the specified standard handle
(STD_OUTPUT_HANDLE, STD_ERROR_HANDLE) has the
ENABLE_VIRTUAL_TERMINAL_PROCESSING flag set */
PHP_WINUTIL_API BOOL php_win32_console_handle_has_vt100(DWORD handle_id);
/*
Check if the console attached to a file descriptor associated to a
stream is a console has the ENABLE_VIRTUAL_TERMINAL_PROCESSING flag set
*/
PHP_WINUTIL_API BOOL php_win32_console_fileno_has_vt100(zend_long fileno);

/* Set/unset the ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for the console
attached to the specified standard handle (STD_OUTPUT_HANDLE,
STD_ERROR_HANDLE) */
PHP_WINUTIL_API BOOL php_win32_console_handle_set_vt100(DWORD handle_id, BOOL enable);
/*
Set/unset the ENABLE_VIRTUAL_TERMINAL_PROCESSING flag for the console
attached to a file descriptor associated to a stream
*/
PHP_WINUTIL_API BOOL php_win32_console_fileno_set_vt100(zend_long fileno, BOOL enable);

#endif
0