more tidy

diff --git a/phpdbg_cmd.c b/phpdbg_cmd.c
index 93f57a8891adce7259422ee3ec1a79b5257d4412..41dead1d1b67b0f84a5ab15f8be6676659de43b7 100644 (file)
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@ -159,6 +159,8 @@ phpdbg_input_t* phpdbg_read_input(TSRMLS_D) /* {{{ */
                                memcpy(
                                        buffer->string, cmd, buffer->length);
                                buffer->string[buffer->length] = '\0';
+                               /* store constant pointer to start of buffer */
+                               buffer->start = (char* const*) buffer->string;
                        }
                }
 

diff --git a/phpdbg_cmd.h b/phpdbg_cmd.h
index 7764b5d8f1117518a28ceeda32d2567a704d7681..03fbd0afc8b295683f4ed651725b8a68951960a4 100644 (file)
--- a/phpdbg_cmd.h
+++ b/phpdbg_cmd.h
@@ -41,8 +41,9 @@ typedef enum {
 } phpdbg_param_type;
 
 typedef struct {
+       char* const*  start;
        char            *string;
-       size_t          length;
+       size_t           length;
 } phpdbg_input_t;
 
 typedef struct _phpdbg_param {

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 01f57f24b89878c444a545b34f53654ddb760795..92e39ec2cfc43e091b8dd4f4ea29d3e8216773e5 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -910,8 +910,12 @@ static PHPDBG_COMMAND(list) /* {{{ */
        return SUCCESS;
 } /* }}} */
 
-static inline int phpdbg_call_register(const char *cmd, size_t cmd_len, const char * start TSRMLS_DC) /* {{{ */
+static inline int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ */
 {
+       /* temporary, until we can handle arrays of strings */
+       const char *cmd = input->string;
+       size_t cmd_len = input->length;
+       const char *start = (const char*) input->start;
        size_t offset = strlen(cmd)+(sizeof(" ")-1);
 
        if (zend_hash_exists(&PHPDBG_G(registered), cmd, strlen(cmd))) {
@@ -966,12 +970,10 @@ int phpdbg_interactive(TSRMLS_D) /* {{{ */
        phpdbg_input_t* input = phpdbg_read_input(TSRMLS_C);
        
        if (input) {
-               char* const* saved = (char* const*) input->string;
-               
                switch (ret = phpdbg_do_cmd(phpdbg_prompt_commands, input->string, input->length TSRMLS_CC)) {
                        case FAILURE:
                                if (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
-                                       if (phpdbg_call_register(input->string, input->length, (const char*) saved TSRMLS_CC) == FAILURE) {
+                                       if (phpdbg_call_register(input TSRMLS_CC) == FAILURE) {
                                                phpdbg_error("Failed to execute %s!", input->string);
                                        }
                                }