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

Author: krakjoe

Changelog.md

@@ -1,16 +1,23 @@
 ChangeLog for phpdbg
 ====================
 
-Version 0.0.2 0000-00-00
+Version 0.1.0 2013-11-23
 ------------------------
 
-1. Added until/u command
+1. New commands:
+  - until    (continue until the current line is executed)
+  - frame    (switch to a frame in the current stack for inspection)
+  - info     (quick access to useful information on the console)
+  - finish   (continue until the current function has returned)
+  - leave    (continue until the current function is returning)
+  - shell    (shell a command)
+  - register (register a function for use as a command)
 2. Added printers for class and method
 3. Make uniform commands and aliases where possible
 4. Include all alias information and sub-command information in help
-5. Added finish/f command
-6. Added info command
-7. Added signal handling to break execution (ctrl-c)
+5. Added signal handling to break execution (ctrl-c)
+6. Fixed #13 (Output Buffering Control seems fail)
+7. Fixed #14 (Fixed typo in Makefile.frag)
 
 
 Version 0.0.1 2013-11-15

phpdbg.c

@@ -344,7 +344,7 @@ static inline int php_sapi_phpdbg_ub_write(const char *message, unsigned int len
 static inline void php_sapi_phpdbg_flush(void *context)  /* {{{ */
 {
 	TSRMLS_FETCH();
-	
+
 	fflush(PHPDBG_G(io)[PHPDBG_STDOUT]);
 } /* }}} */
 
@@ -444,10 +444,10 @@ static void phpdbg_welcome(zend_bool cleaning TSRMLS_DC) /* {{{ */
 static inline void phpdbg_sigint_handler(int signo) /* {{{ */
 {
 	TSRMLS_FETCH();
-	
+
 	if (EG(in_execution)) {
-		/* we don't want to set signalled while phpdbg is interactive */
-		if (!(PHPDBG_G(flags) & PHPDBG_IS_INTERACTIVE)) {
+		/* we don't want to set signalled while phpdbg is not interactive */
+		if (PHPDBG_G(flags) & PHPDBG_IS_INTERACTIVE) {
 			PHPDBG_G(flags) |= PHPDBG_IS_SIGNALED;
 		}
 	} else {
@@ -733,7 +733,7 @@ int main(int argc, char **argv) /* {{{ */
 		if (ini_entries) {
 		    free(ini_entries);
 		}
-		
+
 		if (ini_override) {
 			free(ini_override);
 		}

phpdbg_prompt.c

@@ -93,7 +93,7 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default TS
 			while (fgets(cmd, PHPDBG_MAX_CMD, fp) != NULL) {
 				cmd_len = strlen(cmd)-1;
 
-				while (cmd && cmd_len > 0L && isspace(cmd[cmd_len-1]))
+				while (cmd_len > 0L && isspace(cmd[cmd_len-1]))
 					cmd_len--;
 
 				cmd[cmd_len] = '\0';
@@ -173,10 +173,10 @@ PHPDBG_COMMAND(exec) /* {{{ */
 		        if (sb.st_mode & (S_IFREG|S_IFLNK)) {
 		        	char *res = phpdbg_resolve_path(param->str TSRMLS_CC);
 		        	size_t res_len = strlen(res);
-		        	
-		        	if ((res_len != PHPDBG_G(exec_len)) || 
+
+		        	if ((res_len != PHPDBG_G(exec_len)) ||
 		        		(memcmp(res, PHPDBG_G(exec), res_len) != SUCCESS)) {
-		        		
+
 		        		if (PHPDBG_G(exec)) {
 				        	phpdbg_notice("Unsetting old execution context: %s", PHPDBG_G(exec));
 				        	efree(PHPDBG_G(exec));
@@ -609,7 +609,7 @@ PHPDBG_COMMAND(eval) /* {{{ */
 				!(PHPDBG_G(flags) & PHPDBG_IS_STEPONEVAL)) {
 				PHPDBG_G(flags) |= PHPDBG_IS_STEPPING;
 			}
-			
+
 			CG(unclean_shutdown) = 0;
 		} break;
 
@@ -1083,7 +1083,7 @@ static inline int phpdbg_call_register(phpdbg_input_t *input TSRMLS_DC) /* {{{ *
 		}
 
 		phpdbg_debug(
-			"created %d params from %d argvuments",
+			"created %d params from %d arguments",
 			fci.param_count, input->argc);
 
 		zend_call_function(&fci, NULL TSRMLS_CC);