From 31f7699a857534d24990b1c7d5e06ed81e85ad9b Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Wed, 14 Jan 2004 03:14:18 +0000 Subject: Add optional php-win.exe variation of the CLI sapi. 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 --- sapi/cli/php_cli.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sapi/cli/php_cli.c') diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index 9fc233d304..9ee2dacf83 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -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) { -- cgit v1.2.1