diff options
| author | Joe Watkins <krakjoe@php.net> | 2016-11-13 08:00:15 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2016-11-13 08:00:15 +0000 |
| commit | 6c7e795c150c68785a543a4dc0db897f5a57dd16 (patch) | |
| tree | 8607147989619895510eab5cf42eee5bd3da03e0 /sapi/phpdbg | |
| parent | 5fbf56578731d5926b0e5b646614455416e99437 (diff) | |
| download | php-git-6c7e795c150c68785a543a4dc0db897f5a57dd16.tar.gz | |
phpdbg standard input changes
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 8 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/stdin_001.phpt | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index ce4529d5d1..b0e9cae505 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -2093,7 +2093,7 @@ phpdbg_out: php_request_shutdown(NULL); } zend_end_try(); - if (PHPDBG_G(exec) && !memcmp("-", PHPDBG_G(exec), 2)) { /* i.e. execution context has been read from stdin - back it up */ + if (PHPDBG_G(exec) && strcmp("Standard input code", PHPDBG_G(exec)) == SUCCESS) { /* i.e. execution context has been read from stdin - back it up */ phpdbg_file_source *data = zend_hash_str_find_ptr(&PHPDBG_G(file_sources), PHPDBG_G(exec), PHPDBG_G(exec_len)); backup_phpdbg_compile = zend_string_alloc(data->len + 2, 1); sprintf(ZSTR_VAL(backup_phpdbg_compile), "?>%.*s", (int) data->len, data->buf); diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 99e6437600..ca86583bc1 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -537,16 +537,16 @@ int phpdbg_compile_stdin(zend_string *code) { efree(PHPDBG_G(exec)); } PHPDBG_G(exec) = estrdup("Standard input code"); - PHPDBG_G(exec_len) = 1; + PHPDBG_G(exec_len) = sizeof("Standard input code") - 1; { /* remove leading ?> from source */ int i; - zend_string *source_path = strpprintf(0, "-%c%p", 0, PHPDBG_G(ops)->opcodes); + zend_string *source_path = strpprintf(0, "Standard input code%c%p", 0, PHPDBG_G(ops)->opcodes); phpdbg_file_source *data = zend_hash_find_ptr(&PHPDBG_G(file_sources), source_path); dtor_func_t dtor = PHPDBG_G(file_sources).pDestructor; PHPDBG_G(file_sources).pDestructor = NULL; zend_hash_del(&PHPDBG_G(file_sources), source_path); PHPDBG_G(file_sources).pDestructor = dtor; - zend_hash_str_update_ptr(&PHPDBG_G(file_sources), "Standard input code", 1, data); + zend_hash_str_update_ptr(&PHPDBG_G(file_sources), "Standard input code", sizeof("Standard input code")-1, data); zend_string_release(source_path); efree(data->filename); @@ -559,7 +559,7 @@ int phpdbg_compile_stdin(zend_string *code) { memmove(data->buf, data->buf + 2, data->len); } - phpdbg_notice("compile", "context=\"-\"", "Successful compilation of stdin input"); + phpdbg_notice("compile", "context=\"Standard input code\"", "Successful compilation of stdin input"); return SUCCESS; } diff --git a/sapi/phpdbg/tests/stdin_001.phpt b/sapi/phpdbg/tests/stdin_001.phpt index 0bc940caef..2f93a2d956 100644 --- a/sapi/phpdbg/tests/stdin_001.phpt +++ b/sapi/phpdbg/tests/stdin_001.phpt @@ -13,13 +13,13 @@ r q --EXPECTF-- prompt> [Successful compilation of stdin input] -prompt> [Breakpoint #0 added at -:3] -prompt> [Breakpoint #0 at -:3, hits: 1] +prompt> [Breakpoint #0 added at Standard input code:3] +prompt> [Breakpoint #0 at Standard input code:3, hits: 1] >00003: echo "Hello, world!\n"; 00004: prompt> Hello, world! [Script ended normally] -prompt> [Breakpoint #0 at -:3, hits: 1] +prompt> [Breakpoint #0 at Standard input code:3, hits: 1] >00003: echo "Hello, world!\n"; 00004: -prompt>
\ No newline at end of file +prompt> |