]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://github.com/krakjoe/phpdbg
authorkrakjoe <joe.watkins@live.co.uk>
Tue, 19 Nov 2013 01:50:38 +0000 (01:50 +0000)
committerkrakjoe <joe.watkins@live.co.uk>
Tue, 19 Nov 2013 01:50:38 +0000 (01:50 +0000)
1  2 
phpdbg_prompt.c

diff --cc phpdbg_prompt.c
index 45000a1be9f2b5699b902b09666ff31c603ce6b1,9dfef6b513b3d4e6bca4b160bc614d3f1886ce9b..ba74f206529ebd14b9e9e092ed4fe272a04a94d9
@@@ -914,8 -914,8 +914,8 @@@ int phpdbg_interactive(TSRMLS_D) /* {{
  {
        size_t cmd_len;
        int ret = SUCCESS;
 -      const char *start = NULL;
 +      char  *start = NULL;
-       
  #ifndef HAVE_LIBREADLINE
        char cmd[PHPDBG_MAX_CMD];
  
        while (!(PHPDBG_G(flags) & PHPDBG_IS_QUITTING)) {
                cmd = readline(PROMPT);
                cmd_len = cmd ? strlen(cmd) : 0;
- #endif        
 -
+ #endif
                start = estrndup(cmd, cmd_len);
  
                /* trim space from end of input */
                                                                ZVAL_STRING(farg, &start[offset], 1);
                                                                params[0] = &farg;
                                                        }
-                                                       
                                                        ZVAL_STRINGL(&fname, cmd, strlen(cmd), 1);
-                                                       
 -
                                                        fci.size = sizeof(fci);
                                                        fci.function_table = &PHPDBG_G(registered);
                                                        fci.function_name = &fname;