Re: cvs: php4 /sapi/cli php_cli.c

From: Date: Sat, 08 Feb 2003 14:56:34 +0000
Subject: Re: cvs: php4 /sapi/cli php_cli.c
References: 1  Groups: php.cvs 
Request: Send a blank email to php-cvs+get-18491@lists.php.net to get a copy of this message
Just curious..but was there some agreement on keeping these obscure options?? I kinda missed the discussion.. --Jani On Fri, 7 Feb 2003, Marcus Boerger wrote: >helly Fri Feb 7 16:55:51 2003 EDT > > Modified files: > /php4/sapi/cli php_cli.c > Log: > Define STDIN/OUT/ERR for -B -R -F -E (works as expected). > Enable exit in same switches. > >Index: php4/sapi/cli/php_cli.c >diff -u php4/sapi/cli/php_cli.c:1.66 php4/sapi/cli/php_cli.c:1.67 >--- php4/sapi/cli/php_cli.c:1.66 Fri Feb 7 15:53:05 2003 >+++ php4/sapi/cli/php_cli.c Fri Feb 7 16:55:51 2003 >@@ -360,6 +360,9 @@ > efree(*arg); > } > >+static php_stream_context *sc_in_process = NULL; >+static php_stream *s_in_process = NULL; >+ > static void cli_register_file_handles(TSRMLS_D) > { > zval *zin, *zout, *zerr; >@@ -378,6 +381,9 @@ > if (s_in==NULL || s_out==NULL || s_err==NULL) { > return; > } >+ >+ sc_in_process = sc_in; >+ s_in_process = s_in; > > php_stream_to_zval(s_in, zin); > php_stream_to_zval(s_out, zout); >@@ -903,9 +909,9 @@ > { > char *input; > size_t len, index = 0; >- php_stream_context *sc_in = php_stream_context_alloc(); >- php_stream *s_in = php_stream_open_wrapper_ex("php://stdin", "rb", 0, >NULL, sc_in); > pval *argn, *argi; >+ >+ cli_register_file_handles(TSRMLS_C); > > if (exec_begin && zend_eval_string(exec_begin, NULL, "Command line begin > code" TSRMLS_CC) == FAILURE) { > exit_status=254; >@@ -915,7 +921,7 @@ > Z_LVAL_P(argi) = index; > INIT_PZVAL(argi); > zend_hash_update(&EG(symbol_table), "argi", sizeof("argi"), > &argi, sizeof(pval *), NULL); >- while (exit_status == SUCCESS && (input=php_stream_gets(s_in, NULL, 0)) != NULL) { >+ while (exit_status == SUCCESS && (input=php_stream_gets(s_in_process, NULL, 0)) != >NULL) { > len = strlen(input); > while (len-- && (input[len]=='\n' || input[len]=='\r')) { > input[len] = '\0'; >@@ -948,8 +954,6 @@ > exit_status=254; > } > >- php_stream_close(s_in); >- php_stream_context_free(sc_in); > break; > } > } > > > > -- <- For Sale! ->

« previous php.cvs (#18491) next »