archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add optional php-win.exe variation of the CLI sapi.

Browse source 
php-win.exe runs in the windows GUI subsystem, and thus
has no console; stdio handles are effectively set to /dev/null
and no "dos box" will appear on screen when running scripts
using this sapi (php-gtk people will be familiar with this concept).

Aside from those differences, php-win.exe is 100% identical to
regular CLI
This commit is contained in:
Wez Furlong 2004-01-14 03:14:18 +00:00
parent 6048907029
commit 31f7699a85
3 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sapi/cli/cli_win32.c Normal file
View file

@ -0,0 +1,2 @@
#define PHP_CLI_WIN32_NO_CONSOLE 1
#include "php_cli.c"

5
sapi/cli/config.w32
View file

@ -3,6 +3,7 @@
ARG_ENABLE('cli', 'Build CLI version of PHP', 'yes');
ARG_ENABLE('crt-debug', 'Extra CRT debugging', 'no');
ARG_ENABLE('cli-win32', 'Build console-less CLI version of PHP', 'no');
if (PHP_CLI == "yes") {
SAPI('cli', 'getopt.c php_cli.c', 'php.exe');
@ -11,3 +12,7 @@ if (PHP_CLI == "yes") {
}
}
if (PHP_CLI_WIN32 == "yes") {
SAPI('cli_win32', 'getopt.c cli_win32.c', 'php-win.exe');
}

14
sapi/cli/php_cli.c
View file

@ -204,7 +204,11 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC)
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
#ifdef PHP_CLI_WIN32_NO_CONSOLE
break;
#else
php_handle_aborted_connection();
#endif
}
ptr += ret;
remaining -= ret;
@ -217,7 +221,9 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC)
static void sapi_cli_flush(void *server_context)
{
if (fflush(stdout)==EOF) {
#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
#endif
}
}
@ -510,7 +516,11 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file,
/* {{{ main
*/
#ifdef PHP_CLI_WIN32_NO_CONSOLE
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)
#else
int main(int argc, char *argv[])
#endif
{
int exit_status = SUCCESS;
int c;
@ -536,6 +546,10 @@ int main(int argc, char *argv[])
sapi_globals_struct *sapi_globals;
void ***tsrm_ls;
#endif
#ifdef PHP_CLI_WIN32_NO_CONSOLE
int argc = __argc;
char **argv = __argv;
#endif
#if defined(PHP_WIN32) && defined(_DEBUG) && defined(PHP_WIN32_DEBUG_HEAP)
{