php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #74849 Process is started as interactive shell in PhpStorm

Browse Source
This commit is contained in:
Anatol Belski
2017-07-03 21:58:51 +02:00
parent 55cd4e859b
commit 8871d2d12e
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sapi/cli/php_cli.c
View File

@@ -675,8 +675,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
char *arg_free=NULL, **arg_excp=&arg_free;
char *script_file=NULL, *translated_path = NULL;
#if defined(PHP_WIN32) && !defined(PHP_CLI_WIN32_NO_CONSOLE) && (HAVE_LIBREADLINE || HAVE_LIBEDIT) && !defined(COMPILE_DL_READLINE)
DWORD pl[1];
int interactive = (GetConsoleProcessList(pl, 1) == 1) && !IsDebuggerPresent();
int interactive = php_win32_console_is_own();
#else
int interactive=0;
#endif

12
win32/console.c
View File

@@ -91,3 +91,15 @@ PHP_WINUTIL_API BOOL php_win32_console_fileno_set_vt100(zend_long fileno, BOOL e
}
return result;
}
PHP_WINUTIL_API BOOL php_win32_console_is_own(void)
{
CONSOLE_SCREEN_BUFFER_INFO csbi;
if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi) && !IsDebuggerPresent()) {
return !csbi.dwCursorPosition.X && !csbi.dwCursorPosition.Y;
}
return FALSE;
}

5
win32/console.h
View File

@@ -56,4 +56,9 @@ associated to a file descriptor
*/
PHP_WINUTIL_API BOOL php_win32_console_fileno_set_vt100(zend_long fileno, BOOL enable);
/* Check, whether the program has its own console. If a process was launched
through a GUI, it will have it's own console. For more info see
http://support.microsoft.com/kb/99115 */
PHP_WINUTIL_API BOOL php_win32_console_is_own(void);
#endif