From: krakjoe <joe.watkins@live.co.uk>
Date: Tue, 19 Nov 2013 01:50:38 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fb6df2fa08a2f83aa698892443ecf8c58d9b19e8;p=php

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

fb6df2fa08a2f83aa698892443ecf8c58d9b19e8
diff --cc phpdbg_prompt.c
index 45000a1be9,9dfef6b513..ba74f20652
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -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];
  
@@@ -929,7 -929,8 +929,7 @@@
  	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 */
@@@ -961,9 -962,10 +961,9 @@@
  								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;