[PHP-CVS] com php-src: fix broken sub command error: phpdbg_cmd.c

[Bob Weinand]

Commit:    1ab45b4ccecda8237cf056dfc16a6e8260a0f669
Author:    krakjoe <joe.watk...@live.co.uk>         Wed, 20 Nov 2013 14:40:08 
+0000
Parents:   640bf973ce755e8d97abb15f2e46e6118549b09e
Branches:  PHP-5.6

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=1ab45b4ccecda8237cf056dfc16a6e8260a0f669

Log:
fix broken sub command error

Changed paths:
  M  phpdbg_cmd.c


Diff:
diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index 90d8c1e..f14004f 100644
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -329,15 +329,18 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, const 
phpdbg_input_t *input T
                                                phpdbg_debug(
                                                        "trying sub commands in 
\"%s\" for \"%s\" with %d arguments",
                                                        command->name, 
sub.argv[0]->string, sub.argc-1);
-                                               return 
phpdbg_do_cmd(command->subs, &sub TSRMLS_CC);
-                                       } else {
-                                               phpdbg_parse_param(
-                                                       input->argv[1]->string,
-                                                       input->argv[1]->length,
-                                                       &param TSRMLS_CC);
+                                               if 
(phpdbg_do_cmd(command->subs, &sub TSRMLS_CC) == SUCCESS) {
+                                                       return SUCCESS;
+                                               }
                                        }
+                                       
+                                       /* pass parameter on */
+                                       phpdbg_parse_param(
+                                               input->argv[1]->string,
+                                               input->argv[1]->length,
+                                               &param TSRMLS_CC);
                                }
-
+                               
                                phpdbg_debug(
                                        "found command %s for %s with %d 
arguments",
                                        command->name, input->argv[0]->string, 
input->argc-1);
@@ -367,7 +370,8 @@ int phpdbg_do_cmd(const phpdbg_command_t *command, const 
phpdbg_input_t *input T
                phpdbg_error(
                        "No function executed !!");
        }
-
+       
+out:
        return rc;
 } /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php