From abef3fccc298331efa7242977c779fba17eb29a3 Mon Sep 17 00:00:00 2001 From: krakjoe Date: Sun, 24 Nov 2013 07:37:54 +0000 Subject: [PATCH] typo set last command/param more carefully --- phpdbg_cmd.c | 8 +++++--- phpdbg_prompt.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c index 45c6a770ad..580f68abde 100644 --- a/phpdbg_cmd.c +++ b/phpdbg_cmd.c @@ -380,14 +380,16 @@ PHPDBG_API int phpdbg_do_cmd(const phpdbg_command_t *command, phpdbg_input_t *in } } - if (!(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) { + rc = command->handler(¶m, input TSRMLS_CC); + + /* only set last command when it is worth it ! */ + if ((rc != FAILURE) && + !(PHPDBG_G(flags) & PHPDBG_IS_INITIALIZING)) { PHPDBG_G(lcmd) = (phpdbg_command_t*) command; phpdbg_clear_param( &PHPDBG_G(lparam) TSRMLS_CC); PHPDBG_G(lparam) = param; } - - rc = command->handler(¶m, input TSRMLS_CC); break; } command++; diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c index 552a8bc846..8889450ab2 100644 --- a/phpdbg_prompt.c +++ b/phpdbg_prompt.c @@ -651,7 +651,7 @@ PHPDBG_COMMAND(back) /* {{{ */ zend_hash_move_forward_ex(Z_ARRVAL(zbacktrace), &position); if (zend_hash_get_current_data_ex(Z_ARRVAL(zbacktrace), (void**)&tmp, &position) == FAILURE) { phpdbg_write( - "frame #%d {main} at %s:%d", + "frame #%d: {main} at %s:%d", i, Z_STRVAL_PP(file), Z_LVAL_PP(line)); break; } -- 2.40.0