Move phpdbg_print and helper functions to phpdbg_out.*

7 files changed, 1399 insertions, 1347 deletions

diff --git a/config.m4 b/config.m4
index 3f24e303de..528abb5822 100644
--- a/config.m4
+++ b/config.m4
@@ -33,7 +33,7 @@ if test "$BUILD_PHPDBG" == "" && test "$PHP_PHPDBG" != "no"; then
   fi
 
   PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE"
-  PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_wait.c phpdbg_io.c phpdbg_eol.c"
+  PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_wait.c phpdbg_io.c phpdbg_eol.c phpdbg_out.c"
 
   if test "$PHP_READLINE" != "no" -o  "$PHP_LIBEDIT" != "no"; then
   	PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
diff --git a/config.w32 b/config.w32
index 3f4639399b..6f0bd8f811 100644
--- a/config.w32
+++ b/config.w32
@@ -5,7 +5,7 @@ PHPDBG_SOURCES='phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.
 		'phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c ' +
 		'phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_win.c phpdbg_btree.c '+
 		'phpdbg_parser.c phpdbg_lexer.c phpdbg_sigsafe.c phpdbg_wait.c phpdbg_io.c ' +
-		'phpdbg_sigio_win32.c phpdbg_eol.c';
+		'phpdbg_sigio_win32.c phpdbg_eol.c phpdbg_out.c';
 PHPDBG_DLL='php' + PHP_VERSION + 'phpdbg.dll';
 PHPDBG_EXE='phpdbg.exe';
 
diff --git a/phpdbg.h b/phpdbg.h
index ce90c6a95e..8c0dbb4afa 100644
--- a/phpdbg.h
+++ b/phpdbg.h
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 7-4 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -110,6 +110,7 @@
 #endif
 
 #include "phpdbg_sigsafe.h"
+#include "phpdbg_out.h"
 #include "phpdbg_lexer.h"
 #include "phpdbg_cmd.h"
 #include "phpdbg_utils.h"
diff --git a/phpdbg_out.c b/phpdbg_out.c
new file mode 100644
index 0000000000..a4793f144f
--- /dev/null
+++ b/phpdbg_out.c
@@ -0,0 +1,1305 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2014 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Felipe Pena <felipe@php.net>                                |
+   | Authors: Joe Watkins <joe.watkins@live.co.uk>                        |
+   | Authors: Bob Weinand <bwoebi@php.net>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#include "zend.h"
+#include "php.h"
+#include "spprintf.h"
+#include "phpdbg.h"
+#include "phpdbg_io.h"
+#include "phpdbg_eol.h"
+#include "ext/standard/html.h"
+
+#ifdef _WIN32
+#	include "win32/time.h"
+#endif
+
+ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
+
+/* copied from php-src/main/snprintf.c and slightly modified */
+/*
+ * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
+ *
+ * XXX: this is a magic number; do not decrease it
+ * Emax = 1023
+ * NDIG = 320
+ * NUM_BUF_SIZE >= strlen("-") + Emax + strlrn(".") + NDIG + strlen("E+1023") + 1;
+ */
+#define NUM_BUF_SIZE        2048
+
+/*
+ * Descriptor for buffer area
+ */
+struct buf_area {
+	char *buf_end;
+	char *nextb; /* pointer to next byte to read/write   */
+};
+
+typedef struct buf_area buffy;
+
+/*
+ * The INS_CHAR macro inserts a character in the buffer and writes
+ * the buffer back to disk if necessary
+ * It uses the char pointers sp and bep:
+ *      sp points to the next available character in the buffer
+ *      bep points to the end-of-buffer+1
+ * While using this macro, note that the nextb pointer is NOT updated.
+ *
+ * NOTE: Evaluation of the c argument should not have any side-effects
+ */
+#define INS_CHAR(c, sp, bep, cc) \
+	{                            \
+		if (sp < bep)            \
+		{                        \
+			*sp++ = c;           \
+		}                        \
+		cc++;                    \
+	}
+
+#define NUM( c )			( c - '0' )
+
+#define STR_TO_DEC( str, num )		\
+    num = NUM( *str++ ) ;		\
+    while ( isdigit((int)*str ) )		\
+    {					\
+	num *= 10 ;			\
+	num += NUM( *str++ ) ;		\
+    }
+
+/*
+ * This macro does zero padding so that the precision
+ * requirement is satisfied. The padding is done by
+ * adding '0's to the left of the string that is going
+ * to be printed.
+ */
+#define FIX_PRECISION( adjust, precision, s, s_len )	\
+    if ( adjust )					\
+	while ( s_len < precision )			\
+	{						\
+	    *--s = '0' ;				\
+	    s_len++ ;					\
+	}
+
+/*
+ * Macro that does padding. The padding is done by printing
+ * the character ch.
+ */
+#define PAD( width, len, ch )	do		\
+	{					\
+	    INS_CHAR( ch, sp, bep, cc ) ;	\
+	    width-- ;				\
+	}					\
+	while ( width > len )
+
+/*
+ * Prefix the character ch to the string str
+ * Increase length
+ * Set the has_prefix flag
+ */
+#define PREFIX( str, length, ch )	 *--str = ch ; length++ ; has_prefix = YES
+
+
+#ifdef HAVE_LOCALE_H
+#include <locale.h>
+#define LCONV_DECIMAL_POINT (*lconv->decimal_point)
+#else
+#define LCONV_DECIMAL_POINT '.'
+#endif
+#define NUL '\0'
+#define S_NULL "(null)"
+#define S_NULL_LEN 6
+#define FLOAT_DIGITS 6
+
+/*
+ * Do format conversion placing the output in buffer
+ */
+static int format_converter(register buffy *odp, const char *fmt, zend_bool escape_xml, va_list ap TSRMLS_DC) {
+	char *sp;
+	char *bep;
+	int cc = 0;
+	int i;
+
+	char *s = NULL, *free_s = NULL;
+	int s_len, free_zcopy;
+	zval *zvp, zcopy;
+
+	int min_width = 0;
+	int precision = 0;
+	enum {
+		LEFT, RIGHT
+	} adjust;
+	char pad_char;
+	char prefix_char;
+
+	double fp_num;
+	wide_int i_num = (wide_int) 0;
+	u_wide_int ui_num;
+
+	char num_buf[NUM_BUF_SIZE];
+	char char_buf[2];			/* for printing %% and %<unknown> */
+
+#ifdef HAVE_LOCALE_H
+	struct lconv *lconv = NULL;
+#endif
+
+	/*
+	 * Flag variables
+	 */
+	length_modifier_e modifier;
+	boolean_e alternate_form;
+	boolean_e print_sign;
+	boolean_e print_blank;
+	boolean_e adjust_precision;
+	boolean_e adjust_width;
+	bool_int is_negative;
+
+	sp = odp->nextb;
+	bep = odp->buf_end;
+
+	while (*fmt) {
+		if (*fmt != '%') {
+			INS_CHAR(*fmt, sp, bep, cc);
+		} else {
+			/*
+			 * Default variable settings
+			 */
+			adjust = RIGHT;
+			alternate_form = print_sign = print_blank = NO;
+			pad_char = ' ';
+			prefix_char = NUL;
+			free_zcopy = 0;
+
+			fmt++;
+
+			/*
+			 * Try to avoid checking for flags, width or precision
+			 */
+			if (isascii((int)*fmt) && !islower((int)*fmt)) {
+				/*
+				 * Recognize flags: -, #, BLANK, +
+				 */
+				for (;; fmt++) {
+					if (*fmt == '-')
+						adjust = LEFT;
+					else if (*fmt == '+')
+						print_sign = YES;
+					else if (*fmt == '#')
+						alternate_form = YES;
+					else if (*fmt == ' ')
+						print_blank = YES;
+					else if (*fmt == '0')
+						pad_char = '0';
+					else
+						break;
+				}
+
+				/*
+				 * Check if a width was specified
+				 */
+				if (isdigit((int)*fmt)) {
+					STR_TO_DEC(fmt, min_width);
+					adjust_width = YES;
+				} else if (*fmt == '*') {
+					min_width = va_arg(ap, int);
+					fmt++;
+					adjust_width = YES;
+					if (min_width < 0) {
+						adjust = LEFT;
+						min_width = -min_width;
+					}
+				} else
+					adjust_width = NO;
+
+				/*
+				 * Check if a precision was specified
+				 */
+				if (*fmt == '.') {
+					adjust_precision = YES;
+					fmt++;
+					if (isdigit((int)*fmt)) {
+						STR_TO_DEC(fmt, precision);
+					} else if (*fmt == '*') {
+						precision = va_arg(ap, int);
+						fmt++;
+						if (precision < 0)
+							precision = 0;
+					} else
+						precision = 0;
+
+					if (precision > FORMAT_CONV_MAX_PRECISION && *fmt != 's' && *fmt != 'v' && *fmt != 'b') {
+						precision = FORMAT_CONV_MAX_PRECISION;
+					}
+				} else
+					adjust_precision = NO;
+			} else
+				adjust_precision = adjust_width = NO;
+
+			/*
+			 * Modifier check
+			 */
+			switch (*fmt) {
+				case 'L':
+					fmt++;
+					modifier = LM_LONG_DOUBLE;
+					break;
+				case 'I':
+					fmt++;
+#if SIZEOF_LONG_LONG
+					if (*fmt == '6' && *(fmt+1) == '4') {
+						fmt += 2;
+						modifier = LM_LONG_LONG;
+					} else
+#endif
+						if (*fmt == '3' && *(fmt+1) == '2') {
+							fmt += 2;
+							modifier = LM_LONG;
+						} else {
+#ifdef _WIN64
+							modifier = LM_LONG_LONG;
+#else
+							modifier = LM_LONG;
+#endif
+						}
+					break;
+				case 'l':
+					fmt++;
+#if SIZEOF_LONG_LONG
+					if (*fmt == 'l') {
+						fmt++;
+						modifier = LM_LONG_LONG;
+					} else
+#endif
+						modifier = LM_LONG;
+					break;
+					case 'z':
+					fmt++;
+					modifier = LM_SIZE_T;
+					break;
+				case 'j':
+					fmt++;
+#if SIZEOF_INTMAX_T
+					modifier = LM_INTMAX_T;
+#else
+					modifier = LM_SIZE_T;
+#endif
+					break;
+				case 't':
+					fmt++;
+#if SIZEOF_PTRDIFF_T
+					modifier = LM_PTRDIFF_T;
+#else
+					modifier = LM_SIZE_T;
+#endif
+					break;
+				case 'h':
+					fmt++;
+					if (*fmt == 'h') {
+						fmt++;
+					}
+					/* these are promoted to int, so no break */
+				default:
+					modifier = LM_STD;
+					break;
+			}
+
+			/*
+			 * Argument extraction and printing.
+			 * First we determine the argument type.
+			 * Then, we convert the argument to a string.
+			 * On exit from the switch, s points to the string that
+			 * must be printed, s_len has the length of the string
+			 * The precision requirements, if any, are reflected in s_len.
+			 *
+			 * NOTE: pad_char may be set to '0' because of the 0 flag.
+			 *   It is reset to ' ' by non-numeric formats
+			 */
+			switch (*fmt) {
+				case 'Z':
+					zvp = (zval*) va_arg(ap, zval*);
+					zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
+					if (free_zcopy) {
+						zvp = &zcopy;
+					}
+					s_len = Z_STRLEN_P(zvp);
+					s = Z_STRVAL_P(zvp);
+					if (adjust_precision && precision < s_len) {
+						s_len = precision;
+					}
+					break;
+				case 'u':
+					switch(modifier) {
+						default:
+							i_num = (wide_int) va_arg(ap, unsigned int);
+							break;
+						case LM_LONG_DOUBLE:
+							goto fmt_error;
+						case LM_LONG:
+							i_num = (wide_int) va_arg(ap, unsigned long int);
+							break;
+						case LM_SIZE_T:
+							i_num = (wide_int) va_arg(ap, size_t);
+							break;
+#if SIZEOF_LONG_LONG
+						case LM_LONG_LONG:
+							i_num = (wide_int) va_arg(ap, u_wide_int);
+							break;
+#endif
+#if SIZEOF_INTMAX_T
+						case LM_INTMAX_T:
+							i_num = (wide_int) va_arg(ap, uintmax_t);
+							break;
+#endif
+#if SIZEOF_PTRDIFF_T
+						case LM_PTRDIFF_T:
+							i_num = (wide_int) va_arg(ap, ptrdiff_t);
+							break;
+#endif
+					}
+					/*
+					 * The rest also applies to other integer formats, so fall
+					 * into that case.
+					 */
+				case 'd':
+				case 'i':
+					/*
+					 * Get the arg if we haven't already.
+					 */
+					if ((*fmt) != 'u') {
+						switch(modifier) {
+							default:
+								i_num = (wide_int) va_arg(ap, int);
+								break;
+							case LM_LONG_DOUBLE:
+								goto fmt_error;
+							case LM_LONG:
+								i_num = (wide_int) va_arg(ap, long int);
+								break;
+							case LM_SIZE_T:
+#if SIZEOF_SSIZE_T
+								i_num = (wide_int) va_arg(ap, ssize_t);
+#else
+								i_num = (wide_int) va_arg(ap, size_t);
+#endif
+								break;
+#if SIZEOF_LONG_LONG
+							case LM_LONG_LONG:
+								i_num = (wide_int) va_arg(ap, wide_int);
+								break;
+#endif
+#if SIZEOF_INTMAX_T
+							case LM_INTMAX_T:
+								i_num = (wide_int) va_arg(ap, intmax_t);
+								break;
+#endif
+#if SIZEOF_PTRDIFF_T
+							case LM_PTRDIFF_T:
+								i_num = (wide_int) va_arg(ap, ptrdiff_t);
+								break;
+#endif
+						}
+					}
+					s = ap_php_conv_10(i_num, (*fmt) == 'u', &is_negative,
+								&num_buf[NUM_BUF_SIZE], &s_len);
+					FIX_PRECISION(adjust_precision, precision, s, s_len);
+
+					if (*fmt != 'u') {
+						if (is_negative) {
+							prefix_char = '-';
+						} else if (print_sign) {
+							prefix_char = '+';
+						} else if (print_blank) {
+							prefix_char = ' ';
+						}
+					}
+					break;
+
+
+				case 'o':
+					switch(modifier) {
+						default:
+							ui_num = (u_wide_int) va_arg(ap, unsigned int);
+							break;
+						case LM_LONG_DOUBLE:
+							goto fmt_error;
+						case LM_LONG:
+							ui_num = (u_wide_int) va_arg(ap, unsigned long int);
+							break;
+						case LM_SIZE_T:
+							ui_num = (u_wide_int) va_arg(ap, size_t);
+							break;
+#if SIZEOF_LONG_LONG
+						case LM_LONG_LONG:
+							ui_num = (u_wide_int) va_arg(ap, u_wide_int);
+							break;
+#endif
+#if SIZEOF_INTMAX_T
+						case LM_INTMAX_T:
+							ui_num = (u_wide_int) va_arg(ap, uintmax_t);
+							break;
+#endif
+#if SIZEOF_PTRDIFF_T
+						case LM_PTRDIFF_T:
+							ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
+							break;
+#endif
+					}
+					s = ap_php_conv_p2(ui_num, 3, *fmt, &num_buf[NUM_BUF_SIZE], &s_len);
+					FIX_PRECISION(adjust_precision, precision, s, s_len);
+					if (alternate_form && *s != '0') {
+						*--s = '0';
+						s_len++;
+					}
+					break;
+
+
+				case 'x':
+				case 'X':
+					switch(modifier) {
+						default:
+							ui_num = (u_wide_int) va_arg(ap, unsigned int);
+							break;
+						case LM_LONG_DOUBLE:
+							goto fmt_error;
+						case LM_LONG:
+							ui_num = (u_wide_int) va_arg(ap, unsigned long int);
+							break;
+						case LM_SIZE_T:
+							ui_num = (u_wide_int) va_arg(ap, size_t);
+							break;
+#if SIZEOF_LONG_LONG
+						case LM_LONG_LONG:
+							ui_num = (u_wide_int) va_arg(ap, u_wide_int);
+							break;
+#endif
+#if SIZEOF_INTMAX_T
+						case LM_INTMAX_T:
+							ui_num = (u_wide_int) va_arg(ap, uintmax_t);
+							break;
+#endif
+#if SIZEOF_PTRDIFF_T
+						case LM_PTRDIFF_T:
+							ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
+							break;
+#endif
+					}
+					s = ap_php_conv_p2(ui_num, 4, *fmt, &num_buf[NUM_BUF_SIZE], &s_len);
+					FIX_PRECISION(adjust_precision, precision, s, s_len);
+					if (alternate_form && i_num != 0) {
+						*--s = *fmt;	/* 'x' or 'X' */
+						*--s = '0';
+						s_len += 2;
+					}
+					break;
+
+
+				case 's':
+				case 'v':
+					s = va_arg(ap, char *);
+					if (s != NULL) {
+						if (adjust_precision) {
+							s_len = precision;
+						} else {
+							s_len = strlen(s);
+						}
+
+						if (escape_xml) {
+							/* added: support for xml escaping */
+
+							int old_slen = s_len, i = 0;
+							char *old_s = s, *s_ptr;
+							free_s = s_ptr = s = emalloc(old_slen * 6 + 1);
+							do {
+								if (old_s[i] == '&' || old_s[i] == '"' || old_s[i] == '<') {
+									*s_ptr++ = '&';
+									switch (old_s[i]) {
+										case '"':
+											s_len += 5;
+											*s_ptr++ = 'q';
+											*s_ptr++ = 'u';
+											*s_ptr++ = 'o';
+											*s_ptr++ = 't';
+											break;
+										case '<':
+											s_len += 3;
+											*s_ptr++ = 'l';
+											*s_ptr++ = 't';
+											break;
+										case '&':
+											s_len += 4;
+											*s_ptr++ = 'a';
+											*s_ptr++ = 'm';
+											*s_ptr++ = 'p';
+											break;
+									}
+									*s_ptr++ = ';';
+								} else {
+									*s_ptr++ = old_s[i];
+								}
+							} while (i++ < old_slen);
+						}
+					} else {
+						s = S_NULL;
+						s_len = S_NULL_LEN;
+					}
+					pad_char = ' ';
+					break;
+
+
+				case 'b':
+					if (escape_xml) {
+						s = PHPDBG_G(err_buf).xml;
+					} else {
+						s = PHPDBG_G(err_buf).msg;
+					}
+
+					if (s != NULL) {
+						if (escape_xml) {
+							s_len = PHPDBG_G(err_buf).xmllen;
+						} else {
+							s_len = PHPDBG_G(err_buf).msglen;
+						}
+
+						if (adjust_precision && precision != s_len) {
+							s_len = precision;
+						}
+					} else {
+						s = "";
+						s_len = 0;
+					}
+					pad_char = ' ';
+					break;
+
+
+				case 'r':
+					if (PHPDBG_G(req_id)) {
+						s_len = spprintf(&s, 0, "req=\"%lu\"", PHPDBG_G(req_id));
+						free_s = s;
+					} else {
+						s = "";
+						s_len = 0;
+					}
+					break;
+
+
+				case 'f':
+				case 'F':
+				case 'e':
+				case 'E':
+
+					switch(modifier) {
+						case LM_LONG_DOUBLE:
+							fp_num = (double) va_arg(ap, long double);
+							break;
+						case LM_STD:
+							fp_num = va_arg(ap, double);
+							break;
+						default:
+							goto fmt_error;
+					}
+
+					if (zend_isnan(fp_num)) {
+						s = "NAN";
+						s_len = 3;
+					} else if (zend_isinf(fp_num)) {
+						s = "INF";
+						s_len = 3;
+					} else {
+#ifdef HAVE_LOCALE_H
+						if (!lconv) {
+							lconv = localeconv();
+						}
+#endif
+						s = php_conv_fp((*fmt == 'f')?'F':*fmt, fp_num, alternate_form,
+						 (adjust_precision == NO) ? FLOAT_DIGITS : precision,
+						 (*fmt == 'f')?LCONV_DECIMAL_POINT:'.',
+									&is_negative, &num_buf[1], &s_len);
+						if (is_negative)
+							prefix_char = '-';
+						else if (print_sign)
+							prefix_char = '+';
+						else if (print_blank)
+							prefix_char = ' ';
+					}
+					break;
+
+
+				case 'g':
+				case 'k':
+				case 'G':
+				case 'H':
+					switch(modifier) {
+						case LM_LONG_DOUBLE:
+							fp_num = (double) va_arg(ap, long double);
+							break;
+						case LM_STD:
+							fp_num = va_arg(ap, double);
+							break;
+						default:
+							goto fmt_error;
+					}
+
+					if (zend_isnan(fp_num)) {
+						s = "NAN";
+						s_len = 3;
+						break;
+					} else if (zend_isinf(fp_num)) {
+						if (fp_num > 0) {
+							s = "INF";
+							s_len = 3;
+						} else {
+							s = "-INF";
+							s_len = 4;
+						}
+						break;
+					}
+
+					if (adjust_precision == NO) {
+						precision = FLOAT_DIGITS;
+					} else if (precision == 0) {
+						precision = 1;
+					}
+					/*
+					 * * We use &num_buf[ 1 ], so that we have room for the sign
+					 */
+#ifdef HAVE_LOCALE_H
+					if (!lconv) {
+						lconv = localeconv();
+					}
+#endif
+					s = php_gcvt(fp_num, precision, (*fmt=='H' || *fmt == 'k') ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]);
+					if (*s == '-') {
+						prefix_char = *s++;
+					} else if (print_sign) {
+						prefix_char = '+';
+					} else if (print_blank) {
+						prefix_char = ' ';
+					}
+
+					s_len = strlen(s);
+
+					if (alternate_form && (strchr(s, '.')) == NULL) {
+						s[s_len++] = '.';
+					}
+					break;
+
+
+				case 'c':
+					char_buf[0] = (char) (va_arg(ap, int));
+					s = &char_buf[0];
+					s_len = 1;
+					pad_char = ' ';
+					break;
+
+
+				case '%':
+					char_buf[0] = '%';
+					s = &char_buf[0];
+					s_len = 1;
+					pad_char = ' ';
+					break;
+
+
+				case 'n':
+					*(va_arg(ap, int *)) = cc;
+					goto skip_output;
+
+					/*
+					 * Always extract the argument as a "char *" pointer. We
+					 * should be using "void *" but there are still machines
+					 * that don't understand it.
+					 * If the pointer size is equal to the size of an unsigned
+					 * integer we convert the pointer to a hex number, otherwise
+					 * we print "%p" to indicate that we don't handle "%p".
+					 */
+				case 'p':
+					if (sizeof(char *) <= sizeof(u_wide_int)) {
+						ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
+						s = ap_php_conv_p2(ui_num, 4, 'x',
+								&num_buf[NUM_BUF_SIZE], &s_len);
+						if (ui_num != 0) {
+							*--s = 'x';
+							*--s = '0';
+							s_len += 2;
+						}
+					} else {
+						s = "%p";
+						s_len = 2;
+					}
+					pad_char = ' ';
+					break;
+
+
+				case NUL:
+					/*
+					 * The last character of the format string was %.
+					 * We ignore it.
+					 */
+					continue;
+
+
+fmt_error:
+				php_error(E_ERROR, "Illegal length modifier specified '%c' in s[np]printf call", *fmt);
+					/*
+					 * The default case is for unrecognized %'s.
+					 * We print %<char> to help the user identify what
+					 * option is not understood.
+					 * This is also useful in case the user wants to pass
+					 * the output of format_converter to another function
+					 * that understands some other %<char> (like syslog).
+					 * Note that we can't point s inside fmt because the
+					 * unknown <char> could be preceded by width etc.
+					 */
+				default:
+					char_buf[0] = '%';
+					char_buf[1] = *fmt;
+					s = char_buf;
+					s_len = 2;
+					pad_char = ' ';
+					break;
+			}
+
+			if (prefix_char != NUL) {
+				*--s = prefix_char;
+				s_len++;
+			}
+			if (adjust_width && adjust == RIGHT && min_width > s_len) {
+				if (pad_char == '0' && prefix_char != NUL) {
+					INS_CHAR(*s, sp, bep, cc)
+						s++;
+					s_len--;
+					min_width--;
+				}
+				PAD(min_width, s_len, pad_char);
+			}
+			/*
+			 * Print the string s.
+			 */
+			for (i = s_len; i != 0; i--) {
+				INS_CHAR(*s, sp, bep, cc);
+				s++;
+			}
+
+			if (adjust_width && adjust == LEFT && min_width > s_len)
+				PAD(min_width, s_len, pad_char);
+			if (free_zcopy) {
+				zval_dtor(&zcopy);
+			}
+		}
+skip_output:
+		if (free_s) {
+			efree(free_s);
+			free_s = NULL;
+		}
+
+		fmt++;
+	}
+	odp->nextb = sp;
+	return (cc);
+}
+
+static void strx_printv(int *ccp, char *buf, size_t len, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
+	buffy od;
+	int cc;
+
+	/*
+	 * First initialize the descriptor
+	 * Notice that if no length is given, we initialize buf_end to the
+	 * highest possible address.
+	 */
+	if (len == 0) {
+		od.buf_end = (char *) ~0;
+		od.nextb   = (char *) ~0;
+	} else {
+		od.buf_end = &buf[len-1];
+		od.nextb   = buf;
+	}
+
+	/*
+	 * Do the conversion
+	 */
+	cc = format_converter(&od, format, escape_xml, ap TSRMLS_CC);
+	if (len != 0 && od.nextb <= od.buf_end) {
+		*(od.nextb) = '\0';
+	}
+	if (ccp) {
+		*ccp = cc;
+	}
+}
+
+static int phpdbg_xml_vsnprintf(char *buf, size_t len, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
+	int cc;
+
+	strx_printv(&cc, buf, len, format, escape_xml, ap TSRMLS_CC);
+	return (cc);
+}
+
+PHPDBG_API int phpdbg_xml_vasprintf(char **buf, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
+	va_list ap2;
+	int cc;
+
+	va_copy(ap2, ap);
+	cc = phpdbg_xml_vsnprintf(NULL, 0, format, escape_xml, ap2 TSRMLS_CC);
+	va_end(ap2);
+
+	*buf = NULL;
+
+	if (cc >= 0) {
+		if ((*buf = emalloc(++cc)) != NULL) {
+			if ((cc = phpdbg_xml_vsnprintf(*buf, cc, format, escape_xml, ap TSRMLS_CC)) < 0) {
+				efree(*buf);
+				*buf = NULL;
+			}
+		}
+	}
+
+	return cc;
+}
+/* copy end */
+
+PHPDBG_API int _phpdbg_xml_asprintf(char **buf TSRMLS_DC, const char *format, zend_bool escape_xml, ...) {
+	int ret;
+	va_list va;
+
+	va_start(va, escape_xml);
+	ret = phpdbg_xml_vasprintf(buf, format, escape_xml, va TSRMLS_CC);
+	va_end(va);
+
+	return ret;
+}
+
+PHPDBG_API int _phpdbg_asprintf(char **buf TSRMLS_DC, const char *format, ...) {
+	int ret;
+	va_list va;
+
+	va_start(va, format);
+	ret = phpdbg_xml_vasprintf(buf, format, 0, va TSRMLS_CC);
+	va_end(va);
+
+	return ret;
+}
+
+static int phpdbg_encode_xml(char **buf, char *msg, int msglen, int from, char *to) {
+	int i;
+	int tolen = to ? strlen(to) : 5;
+	char *tmp = *buf = emalloc(msglen * tolen);
+	for (i = 0; i++ < msglen; msg++) {
+		if (*msg == '&') {
+			memcpy(tmp, ZEND_STRL("&amp;"));
+			tmp += sizeof("&amp;") - 1;
+		} else if (*msg == '<') {
+			memcpy(tmp, ZEND_STRL("&lt;"));
+			tmp += sizeof("&lt;") - 1;
+		} else if (((int) *msg) == from) {
+			memcpy(tmp, to, tolen);
+			tmp += tolen;
+		} else {
+			*tmp++ = *msg;
+		}
+	}
+
+	{
+		int len = tmp - *buf;
+		*buf = erealloc(*buf, len + 1);
+		return len;
+	}
+}
+
+static void phpdbg_encode_ctrl_chars(char **buf, int *buflen) {
+	char *tmp, *tmpptr;
+	int len;
+	int i;
+
+	tmp = tmpptr = emalloc(*buflen * 5);
+
+	for (i = 0; i < *buflen; i++) {
+		if ((*buf)[i] < 0x20) {
+			*tmpptr++ = '&';
+			*tmpptr++ = '#';
+			if ((unsigned int) ((*buf)[i]) > 9) {
+				*tmpptr++ = ((*buf)[i] / 10) + '0';
+			}
+			*tmpptr++ = ((*buf)[i] % 10) + '0';
+			*tmpptr++ = ';';
+		} else {
+			*tmpptr++ = (*buf)[i];
+		}
+	}
+
+	len = tmpptr - tmp;
+
+	efree(*buf);
+	*buf = erealloc(tmp, len + 1);
+	*buflen = len;
+}
+
+static int phpdbg_process_print(int fd, int type, const char *tag, const char *msg, int msglen, const char *xml, int xmllen TSRMLS_DC) {
+	char *msgout = NULL, *buf;
+	int msgoutlen, xmloutlen, buflen;
+	const char *severity;
+
+	if ((PHPDBG_G(flags) & PHPDBG_WRITE_XML) && PHPDBG_G(in_script_xml) && PHPDBG_G(in_script_xml) != type) {
+		phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
+		PHPDBG_G(in_script_xml) = 0;
+	}
+
+	switch (type) {
+		case P_ERROR:
+			severity = "error";
+			if (!PHPDBG_G(last_was_newline)) {
+				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+					phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>\n" "</phpdbg>") TSRMLS_CC);
+				} else {
+					phpdbg_mixed_write(fd, ZEND_STRL("\n") TSRMLS_CC);
+				}
+				PHPDBG_G(last_was_newline) = 1;
+			}
+			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
+				msgoutlen = phpdbg_asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, msglen, msg);
+			} else {
+				msgoutlen = phpdbg_asprintf(&msgout, "[%.*s]\n", msglen, msg);
+			}
+			break;
+
+		case P_NOTICE:
+			severity = "notice";
+			if (!PHPDBG_G(last_was_newline)) {
+				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+					phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>\n" "</phpdbg>") TSRMLS_CC);
+				} else {
+					phpdbg_mixed_write(fd, ZEND_STRL("\n") TSRMLS_CC);
+				}
+				PHPDBG_G(last_was_newline) = 1;
+			}
+			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
+				msgoutlen = phpdbg_asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, msglen, msg);
+			} else {
+				msgoutlen = phpdbg_asprintf(&msgout, "[%.*s]\n", msglen, msg);
+			}
+			break;
+
+		case P_WRITELN:
+			severity = "normal";
+			if (msg) {
+				msgoutlen = phpdbg_asprintf(&msgout, "%.*s\n", msglen, msg);
+			} else {
+				msgoutlen = 1;
+				msgout = estrdup("\n");
+			}
+			PHPDBG_G(last_was_newline) = 1;
+			break;
+
+		case P_WRITE:
+			severity = "normal";
+			if (msg) {
+				msgout = estrndup(msg, msglen);
+				msgoutlen = msglen;
+				PHPDBG_G(last_was_newline) = msg[msglen - 1] == '\n';
+			} else {
+				msgoutlen = 0;
+				msgout = estrdup("");
+			}
+			break;
+
+		case P_STDOUT:
+		case P_STDERR:
+			if (msg) {
+				PHPDBG_G(last_was_newline) = msg[msglen - 1] == '\n';
+				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+					if (PHPDBG_G(in_script_xml) != type) {
+						char *stream_buf;
+						int stream_buflen = phpdbg_asprintf(&stream_buf, "<stream type=\"%s\">", type == P_STDERR ? "stderr" : "stdout");
+						phpdbg_mixed_write(fd, stream_buf, stream_buflen TSRMLS_CC);
+						efree(stream_buf);
+						PHPDBG_G(in_script_xml) = type;
+					}
+#if PHP_VERSION_ID >= 50600
+					buf = php_escape_html_entities((unsigned char *) msg, msglen, (size_t *) &buflen, 0, ENT_NOQUOTES, PG(internal_encoding) && PG(internal_encoding)[0] ? PG(internal_encoding) : (SG(default_charset) ? SG(default_charset) : "UTF-8") TSRMLS_CC);
+#else
+					buf = php_escape_html_entities((unsigned char *) msg, msglen, (size_t *) &buflen, 0, ENT_NOQUOTES, SG(default_charset) ? SG(default_charset) : "UTF-8" TSRMLS_CC);
+#endif
+					phpdbg_encode_ctrl_chars(&buf, &buflen);
+					phpdbg_mixed_write(fd, buf, buflen TSRMLS_CC);
+					efree(buf);
+				} else {
+					phpdbg_mixed_write(fd, msg, msglen TSRMLS_CC);
+				}
+				return msglen;
+			}
+		break;
+
+		/* no formatting on logging output */
+		case P_LOG:
+			severity = "log";
+			if (msg) {
+				struct timeval tp;
+				if (gettimeofday(&tp, NULL) == SUCCESS) {
+					msgoutlen = phpdbg_asprintf(&msgout, "[%ld %.8F]: %.*s\n", tp.tv_sec, tp.tv_usec / 1000000., msglen, msg);
+				} else {
+					msgoutlen = FAILURE;
+				}
+			}
+			break;
+	}
+
+	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+		char *xmlout;
+
+		if (PHPDBG_G(req_id)) {
+			char *xmlbuf = NULL;
+			xmllen = phpdbg_asprintf(&xmlbuf, "req=\"%lu\" %.*s", PHPDBG_G(req_id), xmllen, xml);
+			xml = xmlbuf;
+		}
+		if (msgout) {
+			buflen = phpdbg_encode_xml(&buf, msgout, msgoutlen, '"', "&quot;");
+			xmloutlen = phpdbg_asprintf(&xmlout, "<%s severity=\"%s\" %.*s msgout=\"%.*s\" />", tag, severity, xmllen, xml, buflen, buf);
+
+			efree(buf);
+		} else {
+			xmloutlen = phpdbg_asprintf(&xmlout, "<%s severity=\"%s\" %.*s msgout=\"\" />", tag, severity, xmllen, xml);
+		}
+
+		phpdbg_encode_ctrl_chars(&xmlout, &xmloutlen);
+		phpdbg_eol_convert(&xmlout, &xmloutlen TSRMLS_CC);
+		phpdbg_mixed_write(fd, xmlout, xmloutlen TSRMLS_CC);
+		efree(xmlout);
+	} else if (msgout) {
+		phpdbg_eol_convert(&msgout, &msgoutlen TSRMLS_CC);
+		phpdbg_mixed_write(fd, msgout, msgoutlen TSRMLS_CC);
+	}
+
+	if (PHPDBG_G(req_id) && (PHPDBG_G(flags) & PHPDBG_WRITE_XML)) {
+		efree((char *) xml);
+	}
+
+	if (msgout) {
+		efree(msgout);
+	}
+
+	return msgout ? msgoutlen : xmloutlen;
+} /* }}} */
+
+PHPDBG_API int phpdbg_vprint(int type TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, va_list args) {
+	char *msg = NULL, *xml = NULL;
+	int msglen = 0, xmllen = 0;
+	int len;
+	va_list argcpy;
+
+	if (strfmt != NULL && strlen(strfmt) > 0L) {
+		va_copy(argcpy, args);
+		msglen = phpdbg_xml_vasprintf(&msg, strfmt, 0, argcpy TSRMLS_CC);
+		va_end(argcpy);
+	}
+
+	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+		if (xmlfmt != NULL && strlen(xmlfmt) > 0L) {
+			va_copy(argcpy, args);
+			xmllen = phpdbg_xml_vasprintf(&xml, xmlfmt, 1, argcpy TSRMLS_CC);
+			va_end(argcpy);
+		} else {
+			xml = estrdup("");
+		}
+	}
+
+	if (PHPDBG_G(err_buf).active && type != P_STDOUT && type != P_STDERR) {
+		PHPDBG_G(err_buf).type = type;
+		PHPDBG_G(err_buf).fd = fd;
+		PHPDBG_G(err_buf).tag = estrdup(tag);
+		PHPDBG_G(err_buf).msg = msg;
+		PHPDBG_G(err_buf).msglen = msglen;
+		if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+			PHPDBG_G(err_buf).xml = xml;
+			PHPDBG_G(err_buf).xmllen = xmllen;
+		}
+
+		return msglen;
+	}
+
+	len = phpdbg_process_print(fd, type, tag, msg, msglen, xml, xmllen TSRMLS_CC);
+
+	if (msg) {
+		efree(msg);
+	}
+
+	if (xml) {
+		efree(xml);
+	}
+
+	return len;
+}
+
+PHPDBG_API void phpdbg_free_err_buf(TSRMLS_D) {
+	if (PHPDBG_G(err_buf).type == 0) {
+		return;
+	}
+
+	PHPDBG_G(err_buf).type = 0;
+
+	efree(PHPDBG_G(err_buf).tag);
+	efree(PHPDBG_G(err_buf).msg);
+	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+		efree(PHPDBG_G(err_buf).xml);
+	}
+}
+
+PHPDBG_API void phpdbg_activate_err_buf(zend_bool active TSRMLS_DC) {
+	PHPDBG_G(err_buf).active = active;
+}
+
+PHPDBG_API int phpdbg_output_err_buf(const char *tag, const char *xmlfmt, const char *strfmt TSRMLS_DC, ...) {
+	int len;
+	va_list args;
+	int errbuf_active = PHPDBG_G(err_buf).active;
+
+	PHPDBG_G(err_buf).active = 0;
+
+#ifdef ZTS
+	va_start(args, tsrm_ls);
+#else
+	va_start(args, strfmt);
+#endif
+	len = phpdbg_vprint(PHPDBG_G(err_buf).type TSRMLS_CC, PHPDBG_G(err_buf).fd, tag ? tag : PHPDBG_G(err_buf).tag, xmlfmt, strfmt, args);
+	va_end(args);
+
+	PHPDBG_G(err_buf).active = errbuf_active;
+	phpdbg_free_err_buf(TSRMLS_C);
+
+	return len;
+}
+
+PHPDBG_API int phpdbg_print(int type TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) {
+	va_list args;
+	int len;
+
+	va_start(args, strfmt);
+	len = phpdbg_vprint(type TSRMLS_CC, fd, tag, xmlfmt, strfmt, args);
+	va_end(args);
+
+	return len;
+}
+
+PHPDBG_API int phpdbg_xml_internal(int fd TSRMLS_DC, const char *fmt, ...) {
+	int len = 0;
+
+	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+		va_list args;
+		char *buffer;
+		int buflen;
+
+		va_start(args, fmt);
+		buflen = phpdbg_xml_vasprintf(&buffer, fmt, 1, args TSRMLS_CC);
+		va_end(args);
+
+		phpdbg_encode_ctrl_chars(&buffer, &buflen);
+
+		if (PHPDBG_G(in_script_xml)) {
+			phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
+			PHPDBG_G(in_script_xml) = 0;
+		}
+
+		len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
+		efree(buffer);
+	}
+
+	return len;
+}
+
+PHPDBG_API int phpdbg_log_internal(int fd TSRMLS_DC, const char *fmt, ...) {
+	va_list args;
+	char *buffer;
+	int buflen;
+	int len = 0;
+
+	va_start(args, fmt);
+	buflen = phpdbg_xml_vasprintf(&buffer, fmt, 0, args TSRMLS_CC);
+	va_end(args);
+
+	len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
+	efree(buffer);
+
+	return len;
+}
+
+PHPDBG_API int phpdbg_out_internal(int fd TSRMLS_DC, const char *fmt, ...) {
+	va_list args;
+	char *buffer;
+	int buflen;
+	int len = 0;
+
+	va_start(args, fmt);
+	buflen = phpdbg_xml_vasprintf(&buffer, fmt, 0, args TSRMLS_CC);
+	va_end(args);
+
+	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
+		char *msg;
+		int msglen;
+
+		msglen = phpdbg_encode_xml(&msg, buffer, buflen, 256, NULL);
+		phpdbg_encode_ctrl_chars(&msg, &msglen);
+		phpdbg_eol_convert(&msg, &msglen TSRMLS_CC);
+
+		if (PHPDBG_G(in_script_xml)) {
+			phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
+			PHPDBG_G(in_script_xml) = 0;
+		}
+
+		phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>") TSRMLS_CC);
+		len = phpdbg_mixed_write(fd, msg, msglen TSRMLS_CC);
+		phpdbg_mixed_write(fd, ZEND_STRL("</phpdbg>") TSRMLS_CC);
+	} else {
+		phpdbg_eol_convert(&buffer, &buflen TSRMLS_CC);
+		len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
+	}
+
+	return len;
+}
+
+
+PHPDBG_API int phpdbg_rlog_internal(int fd TSRMLS_DC, const char *fmt, ...) { /* {{{ */
+	int rc = 0;
+
+	va_list args;
+	struct timeval tp;
+
+	va_start(args, fmt);
+	if (gettimeofday(&tp, NULL) == SUCCESS) {
+		char friendly[100];
+		char *format = NULL, *buffer = NULL, *outbuf = NULL;
+		const time_t tt = tp.tv_sec;
+
+#ifdef PHP_WIN32
+		strftime(friendly, 100, "%a %b %d %H.%%04d %Y", localtime(&tt));
+#else
+		strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tt));
+#endif
+		phpdbg_asprintf(&buffer, friendly, tp.tv_usec/1000);
+		phpdbg_asprintf(&format, "[%s]: %s\n", buffer, fmt);
+		rc = phpdbg_xml_vasprintf(&outbuf, format, 0, args TSRMLS_CC);
+
+		if (outbuf) {
+			rc = phpdbg_mixed_write(fd, outbuf, rc TSRMLS_CC);
+			efree(outbuf);
+		}
+
+		efree(format);
+		efree(buffer);
+	}
+	va_end(args);
+
+	return rc;
+} /* }}} */
diff --git a/phpdbg_out.h b/phpdbg_out.h
new file mode 100644
index 0000000000..d94fbd7385
--- /dev/null
+++ b/phpdbg_out.h
@@ -0,0 +1,89 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2014 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Felipe Pena <felipe@php.net>                                |
+   | Authors: Joe Watkins <joe.watkins@live.co.uk>                        |
+   | Authors: Bob Weinand <bwoebi@php.net>                                |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef PHPDBG_OUT_H
+#define PHPDBG_OUT_H
+
+/**
+ * Error/notice/formatting helpers
+ */
+enum {
+	P_ERROR  = 1,
+	P_NOTICE,
+	P_WRITELN,
+	P_WRITE,
+	P_STDOUT,
+	P_STDERR,
+	P_LOG
+};
+
+#ifdef ZTS
+PHPDBG_API int phpdbg_print(int severity TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 6, 7);
+#else
+PHPDBG_API int phpdbg_print(int severity TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 5, 6);
+#endif
+
+PHPDBG_API int phpdbg_xml_internal(int fd TSRMLS_DC, const char *fmt, ...);
+PHPDBG_API int phpdbg_log_internal(int fd TSRMLS_DC, const char *fmt, ...);
+PHPDBG_API int phpdbg_out_internal(int fd TSRMLS_DC, const char *fmt, ...);
+
+PHPDBG_API int phpdbg_rlog_internal(int fd TSRMLS_DC, const char *fmt, ...);
+#define phpdbg_rlog(fd, fmt, ...) phpdbg_rlog_internal(fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+
+#define phpdbg_error(tag, xmlfmt, strfmt, ...)              phpdbg_print(P_ERROR   TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_notice(tag, xmlfmt, strfmt, ...)             phpdbg_print(P_NOTICE  TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_writeln(tag, xmlfmt, strfmt, ...)            phpdbg_print(P_WRITELN TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_write(tag, xmlfmt, strfmt, ...)              phpdbg_print(P_WRITE   TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_script(type, fmt, ...)                       phpdbg_print(type      TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, NULL, NULL,   fmt,    ##__VA_ARGS__)
+#define phpdbg_log(fmt, ...) phpdbg_log_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+#define phpdbg_xml(fmt, ...) phpdbg_xml_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+#define phpdbg_out(fmt, ...) phpdbg_out_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+
+#define phpdbg_error_ex(out, tag, xmlfmt, strfmt, ...)      phpdbg_print(P_ERROR   TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_notice_ex(out, tag, xmlfmt, strfmt, ...)     phpdbg_print(P_NOTICE  TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_writeln_ex(out, tag, xmlfmt, strfmt, ...)    phpdbg_print(P_WRITELN TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_write_ex(out, tag, xmlfmt, strfmt, ...)      phpdbg_print(P_WRITE   TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
+#define phpdbg_script_ex(out, type, fmt, ...)               phpdbg_print(type      TSRMLS_CC, out, NULL, NULL,   fmt,    ##__VA_ARGS__)
+#define phpdbg_log_ex(out, fmt, ...) phpdbg_log_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+#define phpdbg_xml_ex(out, fmt, ...) phpdbg_xml_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+#define phpdbg_out_ex(out, fmt, ...) phpdbg_out_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+
+#define phpdbg_xml_asprintf(buf, ...) _phpdbg_xml_asprintf(buf TSRMLS_CC, ##__VA_ARGS__)
+PHPDBG_API int _phpdbg_xml_asprintf(char **buf TSRMLS_DC, const char *format, zend_bool escape_xml, ...);
+
+#define phpdbg_asprintf(buf, ...) _phpdbg_asprintf(buf TSRMLS_CC, ##__VA_ARGS__)
+PHPDBG_API int _phpdbg_asprintf(char **buf TSRMLS_DC, const char *format, ...);
+
+
+#if PHPDBG_DEBUG
+#	define phpdbg_debug(fmt, ...) phpdbg_log_ex(PHPDBG_G(io)[PHPDBG_STDERR].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
+#else
+#	define phpdbg_debug(fmt, ...)
+#endif
+
+PHPDBG_API void phpdbg_free_err_buf(TSRMLS_D);
+PHPDBG_API void phpdbg_activate_err_buf(zend_bool active TSRMLS_DC);
+PHPDBG_API int phpdbg_output_err_buf(const char *tag, const char *xmlfmt, const char *strfmt TSRMLS_DC, ...);
+
+
+/* {{{ For separation */
+#define SEPARATE "------------------------------------------------" /* }}} */
+
+#endif /* PHPDBG_OUT_H */
diff --git a/phpdbg_utils.c b/phpdbg_utils.c
index 69dc7d12d4..fa4b8b0baa 100644
--- a/phpdbg_utils.c
+++ b/phpdbg_utils.c
@@ -18,22 +18,13 @@
    +----------------------------------------------------------------------+
 */
 
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
 #include "zend.h"
 #include "php.h"
-#include "spprintf.h"
 #include "phpdbg.h"
 #include "phpdbg_opcode.h"
-#include "phpdbg_io.h"
 #include "phpdbg_utils.h"
-#include "phpdbg_eol.h"
-#include "ext/standard/html.h"
 
-#ifdef _WIN32
-#	include "win32/time.h"
-#elif defined(HAVE_SYS_IOCTL_H)
+#if defined(HAVE_SYS_IOCTL_H)
 #	include "sys/ioctl.h"
 #	ifndef GWINSZ_IN_SYS_IOCTL
 #		include <termios.h>
@@ -227,1282 +218,6 @@ PHPDBG_API char *phpdbg_trim(const char *str, size_t len, size_t *new_len) /* {{
 
 } /* }}} */
 
-/* copied from php-src/main/snprintf.c and slightly modified */
-/*
- * NUM_BUF_SIZE is the size of the buffer used for arithmetic conversions
- *
- * XXX: this is a magic number; do not decrease it
- * Emax = 1023
- * NDIG = 320
- * NUM_BUF_SIZE >= strlen("-") + Emax + strlrn(".") + NDIG + strlen("E+1023") + 1;
- */
-#define NUM_BUF_SIZE        2048
-
-/*
- * Descriptor for buffer area
- */
-struct buf_area {
-	char *buf_end;
-	char *nextb; /* pointer to next byte to read/write   */
-};
-
-typedef struct buf_area buffy;
-
-/*
- * The INS_CHAR macro inserts a character in the buffer and writes
- * the buffer back to disk if necessary
- * It uses the char pointers sp and bep:
- *      sp points to the next available character in the buffer
- *      bep points to the end-of-buffer+1
- * While using this macro, note that the nextb pointer is NOT updated.
- *
- * NOTE: Evaluation of the c argument should not have any side-effects
- */
-#define INS_CHAR(c, sp, bep, cc) \
-	{                            \
-		if (sp < bep)            \
-		{                        \
-			*sp++ = c;           \
-		}                        \
-		cc++;                    \
-	}
-
-#define NUM( c )			( c - '0' )
-
-#define STR_TO_DEC( str, num )		\
-    num = NUM( *str++ ) ;		\
-    while ( isdigit((int)*str ) )		\
-    {					\
-	num *= 10 ;			\
-	num += NUM( *str++ ) ;		\
-    }
-
-/*
- * This macro does zero padding so that the precision
- * requirement is satisfied. The padding is done by
- * adding '0's to the left of the string that is going
- * to be printed.
- */
-#define FIX_PRECISION( adjust, precision, s, s_len )	\
-    if ( adjust )					\
-	while ( s_len < precision )			\
-	{						\
-	    *--s = '0' ;				\
-	    s_len++ ;					\
-	}
-
-/*
- * Macro that does padding. The padding is done by printing
- * the character ch.
- */
-#define PAD( width, len, ch )	do		\
-	{					\
-	    INS_CHAR( ch, sp, bep, cc ) ;	\
-	    width-- ;				\
-	}					\
-	while ( width > len )
-
-/*
- * Prefix the character ch to the string str
- * Increase length
- * Set the has_prefix flag
- */
-#define PREFIX( str, length, ch )	 *--str = ch ; length++ ; has_prefix = YES
-
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#define LCONV_DECIMAL_POINT (*lconv->decimal_point)
-#else
-#define LCONV_DECIMAL_POINT '.'
-#endif
-#define NUL '\0'
-#define S_NULL "(null)"
-#define S_NULL_LEN 6
-#define FLOAT_DIGITS 6
-
-/*
- * Do format conversion placing the output in buffer
- */
-static int format_converter(register buffy *odp, const char *fmt, zend_bool escape_xml, va_list ap TSRMLS_DC) {
-	char *sp;
-	char *bep;
-	int cc = 0;
-	int i;
-
-	char *s = NULL, *free_s = NULL;
-	int s_len, free_zcopy;
-	zval *zvp, zcopy;
-
-	int min_width = 0;
-	int precision = 0;
-	enum {
-		LEFT, RIGHT
-	} adjust;
-	char pad_char;
-	char prefix_char;
-
-	double fp_num;
-	wide_int i_num = (wide_int) 0;
-	u_wide_int ui_num;
-
-	char num_buf[NUM_BUF_SIZE];
-	char char_buf[2];			/* for printing %% and %<unknown> */
-
-#ifdef HAVE_LOCALE_H
-	struct lconv *lconv = NULL;
-#endif
-
-	/*
-	 * Flag variables
-	 */
-	length_modifier_e modifier;
-	boolean_e alternate_form;
-	boolean_e print_sign;
-	boolean_e print_blank;
-	boolean_e adjust_precision;
-	boolean_e adjust_width;
-	bool_int is_negative;
-
-	sp = odp->nextb;
-	bep = odp->buf_end;
-
-	while (*fmt) {
-		if (*fmt != '%') {
-			INS_CHAR(*fmt, sp, bep, cc);
-		} else {
-			/*
-			 * Default variable settings
-			 */
-			adjust = RIGHT;
-			alternate_form = print_sign = print_blank = NO;
-			pad_char = ' ';
-			prefix_char = NUL;
-			free_zcopy = 0;
-
-			fmt++;
-
-			/*
-			 * Try to avoid checking for flags, width or precision
-			 */
-			if (isascii((int)*fmt) && !islower((int)*fmt)) {
-				/*
-				 * Recognize flags: -, #, BLANK, +
-				 */
-				for (;; fmt++) {
-					if (*fmt == '-')
-						adjust = LEFT;
-					else if (*fmt == '+')
-						print_sign = YES;
-					else if (*fmt == '#')
-						alternate_form = YES;
-					else if (*fmt == ' ')
-						print_blank = YES;
-					else if (*fmt == '0')
-						pad_char = '0';
-					else
-						break;
-				}
-
-				/*
-				 * Check if a width was specified
-				 */
-				if (isdigit((int)*fmt)) {
-					STR_TO_DEC(fmt, min_width);
-					adjust_width = YES;
-				} else if (*fmt == '*') {
-					min_width = va_arg(ap, int);
-					fmt++;
-					adjust_width = YES;
-					if (min_width < 0) {
-						adjust = LEFT;
-						min_width = -min_width;
-					}
-				} else
-					adjust_width = NO;
-
-				/*
-				 * Check if a precision was specified
-				 */
-				if (*fmt == '.') {
-					adjust_precision = YES;
-					fmt++;
-					if (isdigit((int)*fmt)) {
-						STR_TO_DEC(fmt, precision);
-					} else if (*fmt == '*') {
-						precision = va_arg(ap, int);
-						fmt++;
-						if (precision < 0)
-							precision = 0;
-					} else
-						precision = 0;
-
-					if (precision > FORMAT_CONV_MAX_PRECISION && *fmt != 's' && *fmt != 'v' && *fmt != 'b') {
-						precision = FORMAT_CONV_MAX_PRECISION;
-					}
-				} else
-					adjust_precision = NO;
-			} else
-				adjust_precision = adjust_width = NO;
-
-			/*
-			 * Modifier check
-			 */
-			switch (*fmt) {
-				case 'L':
-					fmt++;
-					modifier = LM_LONG_DOUBLE;
-					break;
-				case 'I':
-					fmt++;
-#if SIZEOF_LONG_LONG
-					if (*fmt == '6' && *(fmt+1) == '4') {
-						fmt += 2;
-						modifier = LM_LONG_LONG;
-					} else
-#endif
-						if (*fmt == '3' && *(fmt+1) == '2') {
-							fmt += 2;
-							modifier = LM_LONG;
-						} else {
-#ifdef _WIN64
-							modifier = LM_LONG_LONG;
-#else
-							modifier = LM_LONG;
-#endif
-						}
-					break;
-				case 'l':
-					fmt++;
-#if SIZEOF_LONG_LONG
-					if (*fmt == 'l') {
-						fmt++;
-						modifier = LM_LONG_LONG;
-					} else
-#endif
-						modifier = LM_LONG;
-					break;
-					case 'z':
-					fmt++;
-					modifier = LM_SIZE_T;
-					break;
-				case 'j':
-					fmt++;
-#if SIZEOF_INTMAX_T
-					modifier = LM_INTMAX_T;
-#else
-					modifier = LM_SIZE_T;
-#endif
-					break;
-				case 't':
-					fmt++;
-#if SIZEOF_PTRDIFF_T
-					modifier = LM_PTRDIFF_T;
-#else
-					modifier = LM_SIZE_T;
-#endif
-					break;
-				case 'h':
-					fmt++;
-					if (*fmt == 'h') {
-						fmt++;
-					}
-					/* these are promoted to int, so no break */
-				default:
-					modifier = LM_STD;
-					break;
-			}
-
-			/*
-			 * Argument extraction and printing.
-			 * First we determine the argument type.
-			 * Then, we convert the argument to a string.
-			 * On exit from the switch, s points to the string that
-			 * must be printed, s_len has the length of the string
-			 * The precision requirements, if any, are reflected in s_len.
-			 *
-			 * NOTE: pad_char may be set to '0' because of the 0 flag.
-			 *   It is reset to ' ' by non-numeric formats
-			 */
-			switch (*fmt) {
-				case 'Z':
-					zvp = (zval*) va_arg(ap, zval*);
-					zend_make_printable_zval(zvp, &zcopy, &free_zcopy);
-					if (free_zcopy) {
-						zvp = &zcopy;
-					}
-					s_len = Z_STRLEN_P(zvp);
-					s = Z_STRVAL_P(zvp);
-					if (adjust_precision && precision < s_len) {
-						s_len = precision;
-					}
-					break;
-				case 'u':
-					switch(modifier) {
-						default:
-							i_num = (wide_int) va_arg(ap, unsigned int);
-							break;
-						case LM_LONG_DOUBLE:
-							goto fmt_error;
-						case LM_LONG:
-							i_num = (wide_int) va_arg(ap, unsigned long int);
-							break;
-						case LM_SIZE_T:
-							i_num = (wide_int) va_arg(ap, size_t);
-							break;
-#if SIZEOF_LONG_LONG
-						case LM_LONG_LONG:
-							i_num = (wide_int) va_arg(ap, u_wide_int);
-							break;
-#endif
-#if SIZEOF_INTMAX_T
-						case LM_INTMAX_T:
-							i_num = (wide_int) va_arg(ap, uintmax_t);
-							break;
-#endif
-#if SIZEOF_PTRDIFF_T
-						case LM_PTRDIFF_T:
-							i_num = (wide_int) va_arg(ap, ptrdiff_t);
-							break;
-#endif
-					}
-					/*
-					 * The rest also applies to other integer formats, so fall
-					 * into that case.
-					 */
-				case 'd':
-				case 'i':
-					/*
-					 * Get the arg if we haven't already.
-					 */
-					if ((*fmt) != 'u') {
-						switch(modifier) {
-							default:
-								i_num = (wide_int) va_arg(ap, int);
-								break;
-							case LM_LONG_DOUBLE:
-								goto fmt_error;
-							case LM_LONG:
-								i_num = (wide_int) va_arg(ap, long int);
-								break;
-							case LM_SIZE_T:
-#if SIZEOF_SSIZE_T
-								i_num = (wide_int) va_arg(ap, ssize_t);
-#else
-								i_num = (wide_int) va_arg(ap, size_t);
-#endif
-								break;
-#if SIZEOF_LONG_LONG
-							case LM_LONG_LONG:
-								i_num = (wide_int) va_arg(ap, wide_int);
-								break;
-#endif
-#if SIZEOF_INTMAX_T
-							case LM_INTMAX_T:
-								i_num = (wide_int) va_arg(ap, intmax_t);
-								break;
-#endif
-#if SIZEOF_PTRDIFF_T
-							case LM_PTRDIFF_T:
-								i_num = (wide_int) va_arg(ap, ptrdiff_t);
-								break;
-#endif
-						}
-					}
-					s = ap_php_conv_10(i_num, (*fmt) == 'u', &is_negative,
-								&num_buf[NUM_BUF_SIZE], &s_len);
-					FIX_PRECISION(adjust_precision, precision, s, s_len);
-
-					if (*fmt != 'u') {
-						if (is_negative) {
-							prefix_char = '-';
-						} else if (print_sign) {
-							prefix_char = '+';
-						} else if (print_blank) {
-							prefix_char = ' ';
-						}
-					}
-					break;
-
-
-				case 'o':
-					switch(modifier) {
-						default:
-							ui_num = (u_wide_int) va_arg(ap, unsigned int);
-							break;
-						case LM_LONG_DOUBLE:
-							goto fmt_error;
-						case LM_LONG:
-							ui_num = (u_wide_int) va_arg(ap, unsigned long int);
-							break;
-						case LM_SIZE_T:
-							ui_num = (u_wide_int) va_arg(ap, size_t);
-							break;
-#if SIZEOF_LONG_LONG
-						case LM_LONG_LONG:
-							ui_num = (u_wide_int) va_arg(ap, u_wide_int);
-							break;
-#endif
-#if SIZEOF_INTMAX_T
-						case LM_INTMAX_T:
-							ui_num = (u_wide_int) va_arg(ap, uintmax_t);
-							break;
-#endif
-#if SIZEOF_PTRDIFF_T
-						case LM_PTRDIFF_T:
-							ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
-							break;
-#endif
-					}
-					s = ap_php_conv_p2(ui_num, 3, *fmt, &num_buf[NUM_BUF_SIZE], &s_len);
-					FIX_PRECISION(adjust_precision, precision, s, s_len);
-					if (alternate_form && *s != '0') {
-						*--s = '0';
-						s_len++;
-					}
-					break;
-
-
-				case 'x':
-				case 'X':
-					switch(modifier) {
-						default:
-							ui_num = (u_wide_int) va_arg(ap, unsigned int);
-							break;
-						case LM_LONG_DOUBLE:
-							goto fmt_error;
-						case LM_LONG:
-							ui_num = (u_wide_int) va_arg(ap, unsigned long int);
-							break;
-						case LM_SIZE_T:
-							ui_num = (u_wide_int) va_arg(ap, size_t);
-							break;
-#if SIZEOF_LONG_LONG
-						case LM_LONG_LONG:
-							ui_num = (u_wide_int) va_arg(ap, u_wide_int);
-							break;
-#endif
-#if SIZEOF_INTMAX_T
-						case LM_INTMAX_T:
-							ui_num = (u_wide_int) va_arg(ap, uintmax_t);
-							break;
-#endif
-#if SIZEOF_PTRDIFF_T
-						case LM_PTRDIFF_T:
-							ui_num = (u_wide_int) va_arg(ap, ptrdiff_t);
-							break;
-#endif
-					}
-					s = ap_php_conv_p2(ui_num, 4, *fmt, &num_buf[NUM_BUF_SIZE], &s_len);
-					FIX_PRECISION(adjust_precision, precision, s, s_len);
-					if (alternate_form && i_num != 0) {
-						*--s = *fmt;	/* 'x' or 'X' */
-						*--s = '0';
-						s_len += 2;
-					}
-					break;
-
-
-				case 's':
-				case 'v':
-					s = va_arg(ap, char *);
-					if (s != NULL) {
-						if (adjust_precision) {
-							s_len = precision;
-						} else {
-							s_len = strlen(s);
-						}
-
-						if (escape_xml) {
-							/* added: support for xml escaping */
-
-							int old_slen = s_len, i = 0;
-							char *old_s = s, *s_ptr;
-							free_s = s_ptr = s = emalloc(old_slen * 6 + 1);
-							do {
-								if (old_s[i] == '&' || old_s[i] == '"' || old_s[i] == '<') {
-									*s_ptr++ = '&';
-									switch (old_s[i]) {
-										case '"':
-											s_len += 5;
-											*s_ptr++ = 'q';
-											*s_ptr++ = 'u';
-											*s_ptr++ = 'o';
-											*s_ptr++ = 't';
-											break;
-										case '<':
-											s_len += 3;
-											*s_ptr++ = 'l';
-											*s_ptr++ = 't';
-											break;
-										case '&':
-											s_len += 4;
-											*s_ptr++ = 'a';
-											*s_ptr++ = 'm';
-											*s_ptr++ = 'p';
-											break;
-									}
-									*s_ptr++ = ';';
-								} else {
-									*s_ptr++ = old_s[i];
-								}
-							} while (i++ < old_slen);
-						}
-					} else {
-						s = S_NULL;
-						s_len = S_NULL_LEN;
-					}
-					pad_char = ' ';
-					break;
-
-
-				case 'b':
-					if (escape_xml) {
-						s = PHPDBG_G(err_buf).xml;
-					} else {
-						s = PHPDBG_G(err_buf).msg;
-					}
-
-					if (s != NULL) {
-						if (escape_xml) {
-							s_len = PHPDBG_G(err_buf).xmllen;
-						} else {
-							s_len = PHPDBG_G(err_buf).msglen;
-						}
-
-						if (adjust_precision && precision != s_len) {
-							s_len = precision;
-						}
-					} else {
-						s = "";
-						s_len = 0;
-					}
-					pad_char = ' ';
-					break;
-
-
-				case 'r':
-					if (PHPDBG_G(req_id)) {
-						s_len = spprintf(&s, 0, "req=\"%lu\"", PHPDBG_G(req_id));
-						free_s = s;
-					} else {
-						s = "";
-						s_len = 0;
-					}
-					break;
-
-
-				case 'f':
-				case 'F':
-				case 'e':
-				case 'E':
-
-					switch(modifier) {
-						case LM_LONG_DOUBLE:
-							fp_num = (double) va_arg(ap, long double);
-							break;
-						case LM_STD:
-							fp_num = va_arg(ap, double);
-							break;
-						default:
-							goto fmt_error;
-					}
-
-					if (zend_isnan(fp_num)) {
-						s = "NAN";
-						s_len = 3;
-					} else if (zend_isinf(fp_num)) {
-						s = "INF";
-						s_len = 3;
-					} else {
-#ifdef HAVE_LOCALE_H
-						if (!lconv) {
-							lconv = localeconv();
-						}
-#endif
-						s = php_conv_fp((*fmt == 'f')?'F':*fmt, fp_num, alternate_form,
-						 (adjust_precision == NO) ? FLOAT_DIGITS : precision,
-						 (*fmt == 'f')?LCONV_DECIMAL_POINT:'.',
-									&is_negative, &num_buf[1], &s_len);
-						if (is_negative)
-							prefix_char = '-';
-						else if (print_sign)
-							prefix_char = '+';
-						else if (print_blank)
-							prefix_char = ' ';
-					}
-					break;
-
-
-				case 'g':
-				case 'k':
-				case 'G':
-				case 'H':
-					switch(modifier) {
-						case LM_LONG_DOUBLE:
-							fp_num = (double) va_arg(ap, long double);
-							break;
-						case LM_STD:
-							fp_num = va_arg(ap, double);
-							break;
-						default:
-							goto fmt_error;
-					}
-
-					if (zend_isnan(fp_num)) {
-						s = "NAN";
-						s_len = 3;
-						break;
-					} else if (zend_isinf(fp_num)) {
-						if (fp_num > 0) {
-							s = "INF";
-							s_len = 3;
-						} else {
-							s = "-INF";
-							s_len = 4;
-						}
-						break;
-					}
-
-					if (adjust_precision == NO) {
-						precision = FLOAT_DIGITS;
-					} else if (precision == 0) {
-						precision = 1;
-					}
-					/*
-					 * * We use &num_buf[ 1 ], so that we have room for the sign
-					 */
-#ifdef HAVE_LOCALE_H
-					if (!lconv) {
-						lconv = localeconv();
-					}
-#endif
-					s = php_gcvt(fp_num, precision, (*fmt=='H' || *fmt == 'k') ? '.' : LCONV_DECIMAL_POINT, (*fmt == 'G' || *fmt == 'H')?'E':'e', &num_buf[1]);
-					if (*s == '-') {
-						prefix_char = *s++;
-					} else if (print_sign) {
-						prefix_char = '+';
-					} else if (print_blank) {
-						prefix_char = ' ';
-					}
-
-					s_len = strlen(s);
-
-					if (alternate_form && (strchr(s, '.')) == NULL) {
-						s[s_len++] = '.';
-					}
-					break;
-
-
-				case 'c':
-					char_buf[0] = (char) (va_arg(ap, int));
-					s = &char_buf[0];
-					s_len = 1;
-					pad_char = ' ';
-					break;
-
-
-				case '%':
-					char_buf[0] = '%';
-					s = &char_buf[0];
-					s_len = 1;
-					pad_char = ' ';
-					break;
-
-
-				case 'n':
-					*(va_arg(ap, int *)) = cc;
-					goto skip_output;
-
-					/*
-					 * Always extract the argument as a "char *" pointer. We
-					 * should be using "void *" but there are still machines
-					 * that don't understand it.
-					 * If the pointer size is equal to the size of an unsigned
-					 * integer we convert the pointer to a hex number, otherwise
-					 * we print "%p" to indicate that we don't handle "%p".
-					 */
-				case 'p':
-					if (sizeof(char *) <= sizeof(u_wide_int)) {
-						ui_num = (u_wide_int)((size_t) va_arg(ap, char *));
-						s = ap_php_conv_p2(ui_num, 4, 'x',
-								&num_buf[NUM_BUF_SIZE], &s_len);
-						if (ui_num != 0) {
-							*--s = 'x';
-							*--s = '0';
-							s_len += 2;
-						}
-					} else {
-						s = "%p";
-						s_len = 2;
-					}
-					pad_char = ' ';
-					break;
-
-
-				case NUL:
-					/*
-					 * The last character of the format string was %.
-					 * We ignore it.
-					 */
-					continue;
-
-
-fmt_error:
-				php_error(E_ERROR, "Illegal length modifier specified '%c' in s[np]printf call", *fmt);
-					/*
-					 * The default case is for unrecognized %'s.
-					 * We print %<char> to help the user identify what
-					 * option is not understood.
-					 * This is also useful in case the user wants to pass
-					 * the output of format_converter to another function
-					 * that understands some other %<char> (like syslog).
-					 * Note that we can't point s inside fmt because the
-					 * unknown <char> could be preceded by width etc.
-					 */
-				default:
-					char_buf[0] = '%';
-					char_buf[1] = *fmt;
-					s = char_buf;
-					s_len = 2;
-					pad_char = ' ';
-					break;
-			}
-
-			if (prefix_char != NUL) {
-				*--s = prefix_char;
-				s_len++;
-			}
-			if (adjust_width && adjust == RIGHT && min_width > s_len) {
-				if (pad_char == '0' && prefix_char != NUL) {
-					INS_CHAR(*s, sp, bep, cc)
-						s++;
-					s_len--;
-					min_width--;
-				}
-				PAD(min_width, s_len, pad_char);
-			}
-			/*
-			 * Print the string s.
-			 */
-			for (i = s_len; i != 0; i--) {
-				INS_CHAR(*s, sp, bep, cc);
-				s++;
-			}
-
-			if (adjust_width && adjust == LEFT && min_width > s_len)
-				PAD(min_width, s_len, pad_char);
-			if (free_zcopy) {
-				zval_dtor(&zcopy);
-			}
-		}
-skip_output:
-		if (free_s) {
-			efree(free_s);
-			free_s = NULL;
-		}
-
-		fmt++;
-	}
-	odp->nextb = sp;
-	return (cc);
-}
-
-static void strx_printv(int *ccp, char *buf, size_t len, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
-	buffy od;
-	int cc;
-
-	/*
-	 * First initialize the descriptor
-	 * Notice that if no length is given, we initialize buf_end to the
-	 * highest possible address.
-	 */
-	if (len == 0) {
-		od.buf_end = (char *) ~0;
-		od.nextb   = (char *) ~0;
-	} else {
-		od.buf_end = &buf[len-1];
-		od.nextb   = buf;
-	}
-
-	/*
-	 * Do the conversion
-	 */
-	cc = format_converter(&od, format, escape_xml, ap TSRMLS_CC);
-	if (len != 0 && od.nextb <= od.buf_end) {
-		*(od.nextb) = '\0';
-	}
-	if (ccp) {
-		*ccp = cc;
-	}
-}
-
-static int phpdbg_xml_vsnprintf(char *buf, size_t len, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
-	int cc;
-
-	strx_printv(&cc, buf, len, format, escape_xml, ap TSRMLS_CC);
-	return (cc);
-}
-
-PHPDBG_API int phpdbg_xml_vasprintf(char **buf, const char *format, zend_bool escape_xml, va_list ap TSRMLS_DC) {
-	va_list ap2;
-	int cc;
-
-	va_copy(ap2, ap);
-	cc = phpdbg_xml_vsnprintf(NULL, 0, format, escape_xml, ap2 TSRMLS_CC);
-	va_end(ap2);
-
-	*buf = NULL;
-
-	if (cc >= 0) {
-		if ((*buf = emalloc(++cc)) != NULL) {
-			if ((cc = phpdbg_xml_vsnprintf(*buf, cc, format, escape_xml, ap TSRMLS_CC)) < 0) {
-				efree(*buf);
-				*buf = NULL;
-			}
-		}
-	}
-
-	return cc;
-}
-/* copy end */
-
-#define phpdbg_xml_asprintf(buf, ...) _phpdbg_xml_asprintf(buf TSRMLS_CC, ##__VA_ARGS__)
-PHPDBG_API int _phpdbg_xml_asprintf(char **buf TSRMLS_DC, const char *format, zend_bool escape_xml, ...) {
-	int ret;
-	va_list va;
-
-	va_start(va, escape_xml);
-	ret = phpdbg_xml_vasprintf(buf, format, escape_xml, va TSRMLS_CC);
-	va_end(va);
-
-	return ret;
-}
-
-#define phpdbg_asprintf(buf, ...) _phpdbg_asprintf(buf TSRMLS_CC, ##__VA_ARGS__)
-PHPDBG_API int _phpdbg_asprintf(char **buf TSRMLS_DC, const char *format, ...) {
-	int ret;
-	va_list va;
-
-	va_start(va, format);
-	ret = phpdbg_xml_vasprintf(buf, format, 0, va TSRMLS_CC);
-	va_end(va);
-
-	return ret;
-}
-
-static int phpdbg_encode_xml(char **buf, char *msg, int msglen, int from, char *to) {
-	int i;
-	int tolen = to ? strlen(to) : 5;
-	char *tmp = *buf = emalloc(msglen * tolen);
-	for (i = 0; i++ < msglen; msg++) {
-		if (*msg == '&') {
-			memcpy(tmp, ZEND_STRL("&amp;"));
-			tmp += sizeof("&amp;") - 1;
-		} else if (*msg == '<') {
-			memcpy(tmp, ZEND_STRL("&lt;"));
-			tmp += sizeof("&lt;") - 1;
-		} else if (((int) *msg) == from) {
-			memcpy(tmp, to, tolen);
-			tmp += tolen;
-		} else {
-			*tmp++ = *msg;
-		}
-	}
-
-	{
-		int len = tmp - *buf;
-		*buf = erealloc(*buf, len + 1);
-		return len;
-	}
-}
-
-static void phpdbg_encode_ctrl_chars(char **buf, int *buflen) {
-	char *tmp, *tmpptr;
-	int len;
-	int i;
-
-	tmp = tmpptr = emalloc(*buflen * 5);
-
-	for (i = 0; i < *buflen; i++) {
-		if ((*buf)[i] < 0x20) {
-			*tmpptr++ = '&';
-			*tmpptr++ = '#';
-			if ((unsigned int) ((*buf)[i]) > 9) {
-				*tmpptr++ = ((*buf)[i] / 10) + '0';
-			}
-			*tmpptr++ = ((*buf)[i] % 10) + '0';
-			*tmpptr++ = ';';
-		} else {
-			*tmpptr++ = (*buf)[i];
-		}
-	}
-
-	len = tmpptr - tmp;
-
-	efree(*buf);
-	*buf = erealloc(tmp, len + 1);
-	*buflen = len;
-}
-
-static int phpdbg_process_print(int fd, int type, const char *tag, const char *msg, int msglen, const char *xml, int xmllen TSRMLS_DC) {
-	char *msgout = NULL, *buf;
-	int msgoutlen, xmloutlen, buflen;
-	const char *severity;
-
-	if ((PHPDBG_G(flags) & PHPDBG_WRITE_XML) && PHPDBG_G(in_script_xml) && PHPDBG_G(in_script_xml) != type) {
-		phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
-		PHPDBG_G(in_script_xml) = 0;
-	}
-
-	/* TODO(anyone) colours */
-
-	switch (type) {
-		case P_ERROR:
-			severity = "error";
-			if (!PHPDBG_G(last_was_newline)) {
-				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-					phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>\n" "</phpdbg>") TSRMLS_CC);
-				} else {
-					phpdbg_mixed_write(fd, ZEND_STRL("\n") TSRMLS_CC);
-				}
-				PHPDBG_G(last_was_newline) = 1;
-			}
-			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
-				msgoutlen = phpdbg_asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, msglen, msg);
-			} else {
-				msgoutlen = phpdbg_asprintf(&msgout, "[%.*s]\n", msglen, msg);
-			}
-			break;
-
-		case P_NOTICE:
-			severity = "notice";
-			if (!PHPDBG_G(last_was_newline)) {
-				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-					phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>\n" "</phpdbg>") TSRMLS_CC);
-				} else {
-					phpdbg_mixed_write(fd, ZEND_STRL("\n") TSRMLS_CC);
-				}
-				PHPDBG_G(last_was_newline) = 1;
-			}
-			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
-				msgoutlen = phpdbg_asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, msglen, msg);
-			} else {
-				msgoutlen = phpdbg_asprintf(&msgout, "[%.*s]\n", msglen, msg);
-			}
-			break;
-
-		case P_WRITELN:
-			severity = "normal";
-			if (msg) {
-				msgoutlen = phpdbg_asprintf(&msgout, "%.*s\n", msglen, msg);
-			} else {
-				msgoutlen = 1;
-				msgout = estrdup("\n");
-			}
-			PHPDBG_G(last_was_newline) = 1;
-			break;
-
-		case P_WRITE:
-			severity = "normal";
-			if (msg) {
-				msgout = estrndup(msg, msglen);
-				msgoutlen = msglen;
-				PHPDBG_G(last_was_newline) = msg[msglen - 1] == '\n';
-			} else {
-				msgoutlen = 0;
-				msgout = estrdup("");
-			}
-			break;
-
-		case P_STDOUT:
-		case P_STDERR:
-			if (msg) {
-				PHPDBG_G(last_was_newline) = msg[msglen - 1] == '\n';
-				if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-					if (PHPDBG_G(in_script_xml) != type) {
-						char *stream_buf;
-						int stream_buflen = phpdbg_asprintf(&stream_buf, "<stream type=\"%s\">", type == P_STDERR ? "stderr" : "stdout");
-						phpdbg_mixed_write(fd, stream_buf, stream_buflen TSRMLS_CC);
-						efree(stream_buf);
-						PHPDBG_G(in_script_xml) = type;
-					}
-#if PHP_VERSION_ID >= 50600
-					buf = php_escape_html_entities((unsigned char *) msg, msglen, (size_t *) &buflen, 0, ENT_NOQUOTES, PG(internal_encoding) && PG(internal_encoding)[0] ? PG(internal_encoding) : (SG(default_charset) ? SG(default_charset) : "UTF-8") TSRMLS_CC);
-#else
-					buf = php_escape_html_entities((unsigned char *) msg, msglen, (size_t *) &buflen, 0, ENT_NOQUOTES, SG(default_charset) ? SG(default_charset) : "UTF-8" TSRMLS_CC);
-#endif
-					phpdbg_encode_ctrl_chars(&buf, &buflen);
-					phpdbg_mixed_write(fd, buf, buflen TSRMLS_CC);
-					efree(buf);
-				} else {
-					phpdbg_mixed_write(fd, msg, msglen TSRMLS_CC);
-				}
-				return msglen;
-			}
-		break;
-
-		/* no formatting on logging output */
-		case P_LOG:
-			severity = "log";
-			if (msg) {
-				struct timeval tp;
-				if (gettimeofday(&tp, NULL) == SUCCESS) {
-					msgoutlen = phpdbg_asprintf(&msgout, "[%ld %.8F]: %.*s\n", tp.tv_sec, tp.tv_usec / 1000000., msglen, msg);
-				} else {
-					msgoutlen = FAILURE;
-				}
-			}
-			break;
-	}
-
-	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-		char *xmlout;
-
-		if (PHPDBG_G(req_id)) {
-			char *xmlbuf = NULL;
-			xmllen = phpdbg_asprintf(&xmlbuf, "req=\"%lu\" %.*s", PHPDBG_G(req_id), xmllen, xml);
-			xml = xmlbuf;
-		}
-		if (msgout) {
-			buflen = phpdbg_encode_xml(&buf, msgout, msgoutlen, '"', "&quot;");
-			xmloutlen = phpdbg_asprintf(&xmlout, "<%s severity=\"%s\" %.*s msgout=\"%.*s\" />", tag, severity, xmllen, xml, buflen, buf);
-
-			efree(buf);
-		} else {
-			xmloutlen = phpdbg_asprintf(&xmlout, "<%s severity=\"%s\" %.*s msgout=\"\" />", tag, severity, xmllen, xml);
-		}
-
-		phpdbg_encode_ctrl_chars(&xmlout, &xmloutlen);
-		phpdbg_eol_convert(&xmlout, &xmloutlen TSRMLS_CC);
-		phpdbg_mixed_write(fd, xmlout, xmloutlen TSRMLS_CC);
-		efree(xmlout);
-	} else if (msgout) {
-		phpdbg_eol_convert(&msgout, &msgoutlen TSRMLS_CC);
-		phpdbg_mixed_write(fd, msgout, msgoutlen TSRMLS_CC);
-	}
-
-	if (PHPDBG_G(req_id) && (PHPDBG_G(flags) & PHPDBG_WRITE_XML)) {
-		efree((char *) xml);
-	}
-
-	if (msgout) {
-		efree(msgout);
-	}
-
-	return msgout ? msgoutlen : xmloutlen;
-} /* }}} */
-
-PHPDBG_API int phpdbg_vprint(int type TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, va_list args) {
-	char *msg = NULL, *xml = NULL;
-	int msglen = 0, xmllen = 0;
-	int len;
-	va_list argcpy;
-
-	if (strfmt != NULL && strlen(strfmt) > 0L) {
-		va_copy(argcpy, args);
-		msglen = phpdbg_xml_vasprintf(&msg, strfmt, 0, argcpy TSRMLS_CC);
-		va_end(argcpy);
-	}
-
-	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-		if (xmlfmt != NULL && strlen(xmlfmt) > 0L) {
-			va_copy(argcpy, args);
-			xmllen = phpdbg_xml_vasprintf(&xml, xmlfmt, 1, argcpy TSRMLS_CC);
-			va_end(argcpy);
-		} else {
-			xml = estrdup("");
-		}
-	}
-
-	if (PHPDBG_G(err_buf).active && type != P_STDOUT && type != P_STDERR) {
-		PHPDBG_G(err_buf).type = type;
-		PHPDBG_G(err_buf).fd = fd;
-		PHPDBG_G(err_buf).tag = estrdup(tag);
-		PHPDBG_G(err_buf).msg = msg;
-		PHPDBG_G(err_buf).msglen = msglen;
-		if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-			PHPDBG_G(err_buf).xml = xml;
-			PHPDBG_G(err_buf).xmllen = xmllen;
-		}
-
-		return msglen;
-	}
-
-	len = phpdbg_process_print(fd, type, tag, msg, msglen, xml, xmllen TSRMLS_CC);
-
-	if (msg) {
-		efree(msg);
-	}
-
-	if (xml) {
-		efree(xml);
-	}
-
-	return len;
-}
-
-PHPDBG_API void phpdbg_free_err_buf(TSRMLS_D) {
-	if (PHPDBG_G(err_buf).type == 0) {
-		return;
-	}
-
-	PHPDBG_G(err_buf).type = 0;
-
-	efree(PHPDBG_G(err_buf).tag);
-	efree(PHPDBG_G(err_buf).msg);
-	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-		efree(PHPDBG_G(err_buf).xml);
-	}
-}
-
-PHPDBG_API void phpdbg_activate_err_buf(zend_bool active TSRMLS_DC) {
-	PHPDBG_G(err_buf).active = active;
-}
-
-PHPDBG_API int phpdbg_output_err_buf(const char *tag, const char *xmlfmt, const char *strfmt TSRMLS_DC, ...) {
-	int len;
-	va_list args;
-	int errbuf_active = PHPDBG_G(err_buf).active;
-
-	PHPDBG_G(err_buf).active = 0;
-
-#ifdef ZTS
-	va_start(args, tsrm_ls);
-#else
-	va_start(args, strfmt);
-#endif
-	len = phpdbg_vprint(PHPDBG_G(err_buf).type TSRMLS_CC, PHPDBG_G(err_buf).fd, tag ? tag : PHPDBG_G(err_buf).tag, xmlfmt, strfmt, args);
-	va_end(args);
-
-	PHPDBG_G(err_buf).active = errbuf_active;
-	phpdbg_free_err_buf(TSRMLS_C);
-
-	return len;
-}
-
-PHPDBG_API int phpdbg_print(int type TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) {
-	va_list args;
-	int len;
-
-	va_start(args, strfmt);
-	len = phpdbg_vprint(type TSRMLS_CC, fd, tag, xmlfmt, strfmt, args);
-	va_end(args);
-
-	return len;
-}
-
-PHPDBG_API int phpdbg_xml_internal(int fd TSRMLS_DC, const char *fmt, ...) {
-	int len = 0;
-
-	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-		va_list args;
-		char *buffer;
-		int buflen;
-
-		va_start(args, fmt);
-		buflen = phpdbg_xml_vasprintf(&buffer, fmt, 1, args TSRMLS_CC);
-		va_end(args);
-
-		phpdbg_encode_ctrl_chars(&buffer, &buflen);
-
-		if (PHPDBG_G(in_script_xml)) {
-			phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
-			PHPDBG_G(in_script_xml) = 0;
-		}
-
-		len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
-		efree(buffer);
-	}
-
-	return len;
-}
-
-PHPDBG_API int phpdbg_log_internal(int fd TSRMLS_DC, const char *fmt, ...) {
-	va_list args;
-	char *buffer;
-	int buflen;
-	int len = 0;
-
-	va_start(args, fmt);
-	buflen = phpdbg_xml_vasprintf(&buffer, fmt, 0, args TSRMLS_CC);
-	va_end(args);
-
-	len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
-	efree(buffer);
-
-	return len;
-}
-
-PHPDBG_API int phpdbg_out_internal(int fd TSRMLS_DC, const char *fmt, ...) {
-	va_list args;
-	char *buffer;
-	int buflen;
-	int len = 0;
-
-	va_start(args, fmt);
-	buflen = phpdbg_xml_vasprintf(&buffer, fmt, 0, args TSRMLS_CC);
-	va_end(args);
-
-	if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
-		char *msg;
-		int msglen;
-
-		msglen = phpdbg_encode_xml(&msg, buffer, buflen, 256, NULL);
-		phpdbg_encode_ctrl_chars(&msg, &msglen);
-		phpdbg_eol_convert(&msg, &msglen TSRMLS_CC);
-
-		if (PHPDBG_G(in_script_xml)) {
-			phpdbg_mixed_write(fd, ZEND_STRL("</stream>") TSRMLS_CC);
-			PHPDBG_G(in_script_xml) = 0;
-		}
-
-		phpdbg_mixed_write(fd, ZEND_STRL("<phpdbg>") TSRMLS_CC);
-		len = phpdbg_mixed_write(fd, msg, msglen TSRMLS_CC);
-		phpdbg_mixed_write(fd, ZEND_STRL("</phpdbg>") TSRMLS_CC);
-	} else {
-		phpdbg_eol_convert(&buffer, &buflen TSRMLS_CC);
-		len = phpdbg_mixed_write(fd, buffer, buflen TSRMLS_CC);
-	}
-
-	return len;
-}
-
-
-PHPDBG_API int phpdbg_rlog_internal(int fd TSRMLS_DC, const char *fmt, ...) { /* {{{ */
-	int rc = 0;
-
-	va_list args;
-	struct timeval tp;
-
-	va_start(args, fmt);
-	if (gettimeofday(&tp, NULL) == SUCCESS) {
-		char friendly[100];
-		char *format = NULL, *buffer = NULL, *outbuf = NULL;
-		const time_t tt = tp.tv_sec;
-
-#ifdef PHP_WIN32
-		strftime(friendly, 100, "%a %b %d %H.%%04d %Y", localtime(&tt));
-#else
-		strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tt));
-#endif
-		phpdbg_asprintf(&buffer, friendly, tp.tv_usec/1000);
-		phpdbg_asprintf(&format, "[%s]: %s\n", buffer, fmt);
-		rc = phpdbg_xml_vasprintf(&outbuf, format, 0, args TSRMLS_CC);
-
-		if (outbuf) {
-			rc = phpdbg_mixed_write(fd, outbuf, rc TSRMLS_CC);
-			efree(outbuf);
-		}
-
-		efree(format);
-		efree(buffer);
-	}
-	va_end(args);
-
-	return rc;
-} /* }}} */
-
 PHPDBG_API const phpdbg_color_t *phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC) /* {{{ */
 {
 	const phpdbg_color_t *color = colors;
diff --git a/phpdbg_utils.h b/phpdbg_utils.h
index cee39c4879..52338c1836 100644
--- a/phpdbg_utils.h
+++ b/phpdbg_utils.h
@@ -33,64 +33,6 @@ PHPDBG_API char *phpdbg_resolve_path(const char* TSRMLS_DC);
 PHPDBG_API char *phpdbg_trim(const char*, size_t, size_t*);
 PHPDBG_API const zend_function *phpdbg_get_function(const char*, const char* TSRMLS_DC);
 
-/**
- * Error/notice/formatting helpers
- */
-enum {
-	P_ERROR  = 1,
-	P_NOTICE,
-	P_WRITELN,
-	P_WRITE,
-	P_STDOUT,
-	P_STDERR,
-	P_LOG
-};
-
-#ifdef ZTS
-PHPDBG_API int phpdbg_print(int severity TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 6, 7);
-#else
-PHPDBG_API int phpdbg_print(int severity TSRMLS_DC, int fd, const char *tag, const char *xmlfmt, const char *strfmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 5, 6);
-#endif
-
-PHPDBG_API int phpdbg_xml_internal(int fd TSRMLS_DC, const char *fmt, ...);
-PHPDBG_API int phpdbg_log_internal(int fd TSRMLS_DC, const char *fmt, ...);
-PHPDBG_API int phpdbg_out_internal(int fd TSRMLS_DC, const char *fmt, ...);
-
-PHPDBG_API int phpdbg_rlog_internal(int fd TSRMLS_DC, const char *fmt, ...);
-#define phpdbg_rlog(fd, fmt, ...) phpdbg_rlog_internal(fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-
-#define phpdbg_error(tag, xmlfmt, strfmt, ...)              phpdbg_print(P_ERROR   TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_notice(tag, xmlfmt, strfmt, ...)             phpdbg_print(P_NOTICE  TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_writeln(tag, xmlfmt, strfmt, ...)            phpdbg_print(P_WRITELN TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_write(tag, xmlfmt, strfmt, ...)              phpdbg_print(P_WRITE   TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_script(type, fmt, ...)                       phpdbg_print(type      TSRMLS_CC, PHPDBG_G(io)[PHPDBG_STDOUT].fd, NULL, NULL,   fmt,    ##__VA_ARGS__)
-#define phpdbg_log(fmt, ...) phpdbg_log_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-#define phpdbg_xml(fmt, ...) phpdbg_xml_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-#define phpdbg_out(fmt, ...) phpdbg_out_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-
-#define phpdbg_error_ex(out, tag, xmlfmt, strfmt, ...)      phpdbg_print(P_ERROR   TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_notice_ex(out, tag, xmlfmt, strfmt, ...)     phpdbg_print(P_NOTICE  TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_writeln_ex(out, tag, xmlfmt, strfmt, ...)    phpdbg_print(P_WRITELN TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_write_ex(out, tag, xmlfmt, strfmt, ...)      phpdbg_print(P_WRITE   TSRMLS_CC, out, tag,  xmlfmt, strfmt, ##__VA_ARGS__)
-#define phpdbg_script_ex(out, type, fmt, ...)               phpdbg_print(type      TSRMLS_CC, out, NULL, NULL,   fmt,    ##__VA_ARGS__)
-#define phpdbg_log_ex(out, fmt, ...) phpdbg_log_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-#define phpdbg_xml_ex(out, fmt, ...) phpdbg_xml_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-#define phpdbg_out_ex(out, fmt, ...) phpdbg_out_internal(PHPDBG_G(io)[PHPDBG_STDOUT].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-
-#if PHPDBG_DEBUG
-#	define phpdbg_debug(fmt, ...) phpdbg_log_ex(PHPDBG_G(io)[PHPDBG_STDERR].fd TSRMLS_CC, fmt, ##__VA_ARGS__)
-#else
-#	define phpdbg_debug(fmt, ...)
-#endif
-
-PHPDBG_API void phpdbg_free_err_buf(TSRMLS_D);
-PHPDBG_API void phpdbg_activate_err_buf(zend_bool active TSRMLS_DC);
-PHPDBG_API int phpdbg_output_err_buf(const char *tag, const char *xmlfmt, const char *strfmt TSRMLS_DC, ...);
-
-
-/* {{{ For separation */
-#define SEPARATE "------------------------------------------------" /* }}} */
-
 /* {{{ Color Management */
 #define PHPDBG_COLOR_LEN 12
 #define PHPDBG_COLOR_D(color, code) \