From: Bob Weinand <bobwei9@hotmail.com>
Date: Fri, 22 Nov 2013 17:32:00 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/krakjoe/phpdbg into frames
X-Git-Tag: php-5.6.0alpha1~110^2~143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c46a4136976fe3645e34b18659460dd495bc6088;p=php

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

Conflicts:
	phpdbg.h
	phpdbg_prompt.c
---

c46a4136976fe3645e34b18659460dd495bc6088
diff --cc phpdbg.c
index 4b9d39b638,f15f49f589..235660f7f1
--- a/phpdbg.c
+++ b/phpdbg.c
@@@ -44,8 -44,10 +44,11 @@@ static inline void php_phpdbg_globals_c
      pg->lcmd = NULL;
      pg->flags = PHPDBG_DEFAULT_FLAGS;
      pg->oplog = NULL;
+     pg->io[PHPDBG_STDIN] = NULL;
+     pg->io[PHPDBG_STDOUT] = NULL;
+     pg->io[PHPDBG_STDERR] = NULL;
      memset(&pg->lparam, 0, sizeof(phpdbg_param_t));
 +    pg->frame.num = 0;
  } /* }}} */
  
  static PHP_MINIT_FUNCTION(phpdbg) /* {{{ */
diff --cc phpdbg.h
index 98c007036e,aa6c7ca7c2..3e25965e91
--- a/phpdbg.h
+++ b/phpdbg.h
@@@ -127,7 -132,7 +133,8 @@@ ZEND_BEGIN_MODULE_GLOBALS(phpdbg
  	HashTable seek;						/* seek oplines */
  	zend_ulong flags;                   /* phpdbg flags */
  	HashTable registered;				/* registered */
 +	phpdbg_frame frame;		/* frame */
+ 	FILE *io[3];						/* stdin/stdout/stderr */
  ZEND_END_MODULE_GLOBALS(phpdbg) /* }}} */
  
  #endif /* PHPDBG_H */
diff --cc phpdbg_prompt.c
index 3a7ebacdb8,fdd60449bf..27f0b73991
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@@ -32,10 -32,9 +32,10 @@@
  #include "phpdbg_utils.h"
  #include "phpdbg_prompt.h"
  #include "phpdbg_cmd.h"
 +#include "phpdbg_frame.h"
  
  /* {{{ command declarations */
- static const phpdbg_command_t phpdbg_prompt_commands[] = {
+ const phpdbg_command_t phpdbg_prompt_commands[] = {
  	PHPDBG_COMMAND_D(exec,    "set execution context",                    'e', NULL, 1),
  	PHPDBG_COMMAND_D(compile, "attempt compilation", 					  'c', NULL, 0),
  	PHPDBG_COMMAND_D(step,    "step through execution",                   's', NULL, 1),