Merge branch 'master' of https://github.com/krakjoe/phpdbg

diff --cc phpdbg_cmd.c
index d730001cfa99ce173a32c8c60fa2bc2eb76af29f,d1767b00fb35da6c307636050c7dfad0b9b69b07..27470be940ef24de11bc07a8e323316d732fe847
--- 1/phpdbg_cmd.c
--- 2/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@@ -250,32 -247,26 +250,26 @@@ phpdbg_input_t *phpdbg_read_input(char 
  
                buffer->string = phpdbg_trim(cmd, strlen(cmd), &buffer->length);
  
-               if (buffer->string) {
-                       /* temporary, when we switch to argv/argc handling
-                               will be unnecessary */
-                       char *store = (char*) estrdup(buffer->string);
+               /* store constant pointer to start of buffer */
+               buffer->start = (char* const*) buffer->string;
  
-                       /* store constant pointer to start of buffer */
-                       buffer->start = (char* const*) buffer->string;
+               buffer->argv = phpdbg_read_argv(
+                       buffer->string, &buffer->argc TSRMLS_CC);
  
-                       buffer->argv = phpdbg_read_argv(
-                               store, &buffer->argc TSRMLS_CC);
+ #ifdef PHPDBG_DEBUG
+               if (buffer->argc) {
+                       int arg = 0;
  
-                       if (buffer->argc) {
-                               int arg = 0;
- 
-                               while (arg < buffer->argc) {
-                                       phpdbg_debug(
-                                               "argv %d=%s", arg, buffer->argv[arg]->string);
-                                       arg++;
-                               }
+                       while (arg < buffer->argc) {
+                               phpdbg_debug(
+                                       "argv %d=%s", arg, buffer->argv[arg]->string);
+                               arg++;
                        }
- 
-                       efree(store);
                }
+ #endif
  
  #ifdef HAVE_LIBREADLINE
 -              if (cmd) {
 +              if (!buffered && cmd) {
                        free(cmd);
                }
  #endif
@@@ -333,10 -324,10 +327,9 @@@ int phpdbg_do_cmd(const phpdbg_command_
                                                sub.argv = &input->argv[1];
  
                                                phpdbg_debug(
-                                                       "trying sub commands in \"%s\" for \"%s\" with %d arguments", 
+                                                       "trying sub commands in \"%s\" for \"%s\" with %d arguments",
                                                        command->name, sub.argv[0]->string, sub.argc-1);
-                                       
 -
 -                                              return phpdbg_do_cmd_ex(command->subs, &sub TSRMLS_CC);
 +                                              return phpdbg_do_cmd(command->subs, &sub TSRMLS_CC);
                                        } else {
                                                phpdbg_parse_param(
                                                        input->argv[1]->string,

diff --cc phpdbg_cmd.h
Simple merge