archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Fix conflict

Browse source
This commit is contained in:
Felipe Pena 2013-11-10 15:51:20 -02:00
commit 22f0ff6c12
4 changed files with 114 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
phpdbg_prompt.c
View file

@ -127,8 +127,10 @@ static PHPDBG_COMMAND(run) { /* {{{ */
zend_try {
zend_execute(EG(active_op_array) TSRMLS_CC);
} zend_catch {
printf("Caught excetion in VM\n");
return FAILURE;
if (!PHPDBG_G(quitting)) {
printf("Caught excetion in VM\n");
return FAILURE;
} else return SUCCESS;
} zend_end_try();
return SUCCESS;
@ -140,10 +142,13 @@ static PHPDBG_COMMAND(run) { /* {{{ */
static PHPDBG_COMMAND(eval) { /* {{{ */
zval retval;
if (expr) {
if (zend_eval_stringl((char*)expr, expr_len-1, &retval, "eval()'d code" TSRMLS_CC) == SUCCESS) {
printf("Success\n");
printf("Success: ");
zend_print_zval_r(
&retval, 0 TSRMLS_CC);
printf("\n");
zval_dtor(&retval);
}
} else {
@ -276,6 +281,8 @@ static PHPDBG_COMMAND(break) /* {{{ */
static PHPDBG_COMMAND(quit) /* {{{ */
{
PHPDBG_G(quitting)=1;
zend_bailout();
return SUCCESS;
@ -399,7 +406,8 @@ int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
printf("phpdbg> ");
while (fgets(cmd, PHPDBG_MAX_CMD, stdin) != NULL) {
while (!PHPDBG_G(quitting) &&
fgets(cmd, PHPDBG_MAX_CMD, stdin) != NULL) {
size_t cmd_len = strlen(cmd) - 1;
while (cmd[cmd_len] == '\n') {
@ -409,7 +417,10 @@ int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
if (cmd_len) {
switch (phpdbg_do_cmd(phpdbg_prompt_commands, cmd, cmd_len TSRMLS_CC)) {
case FAILURE:
printf("error executing %s !\n", cmd);
if (!PHPDBG_G(quitting)) {
printf(
"Failed to execute %s !\n", cmd);
}
break;
case PHPDBG_NEXT:
@ -417,7 +428,9 @@ int phpdbg_interactive(int argc, char **argv TSRMLS_DC) /* {{{ */
}
}
printf("phpdbg> ");
if (!PHPDBG_G(quitting)) {
printf("phpdbg> ");
}
}
return SUCCESS;