1 files changed, 116 insertions, 303 deletions

diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c
index 85b6eeb3b5..3ce2fade17 100644
--- a/sapi/phpdbg/phpdbg_utils.c
+++ b/sapi/phpdbg/phpdbg_utils.c
@@ -18,14 +18,19 @@
    +----------------------------------------------------------------------+
 */
 
+#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_utils.h"
 
-#if defined(HAVE_SYS_IOCTL_H)
+#ifdef _WIN32
+#	include "win32/time.h"
+#elif defined(HAVE_SYS_IOCTL_H) 
 #	include "sys/ioctl.h"
 #	ifndef GWINSZ_IN_SYS_IOCTL
 #		include <termios.h>
@@ -123,12 +128,12 @@ PHPDBG_API int phpdbg_is_class_method(const char *str, size_t len, char **class,
 	}
 
 	if (class != NULL) {
-
+	
 		if (str[0] == '\\') {
 			str++;
 			len--;
 		}
-
+		
 		*class = estrndup(str, sep - str);
 		(*class)[sep - str] = 0;
 	}
@@ -219,6 +224,103 @@ PHPDBG_API char *phpdbg_trim(const char *str, size_t len, size_t *new_len) /* {{
 
 } /* }}} */
 
+PHPDBG_API int phpdbg_print(int type TSRMLS_DC, FILE *fp, const char *format, ...) /* {{{ */
+{
+	int rc = 0;
+	char *buffer = NULL;
+	va_list args;
+
+	if (format != NULL && strlen(format) > 0L) {
+		va_start(args, format);
+		vspprintf(&buffer, 0, format, args);
+		va_end(args);
+	}
+
+	/* TODO(anyone) colours */
+
+	switch (type) {
+		case P_ERROR:
+			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
+				rc = fprintf(fp,
+						"\033[%sm[%s]\033[0m\n",
+						PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, buffer);
+			} else {
+				rc = fprintf(fp, "[%s]\n", buffer);
+			}
+		break;
+
+		case P_NOTICE:
+			if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
+				rc = fprintf(fp,
+						"\033[%sm[%s]\033[0m\n",
+						PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, buffer);
+			} else {
+				rc = fprintf(fp, "[%s]\n", buffer);
+			}
+		break;
+
+		case P_WRITELN: {
+			if (buffer) {
+				rc = fprintf(fp, "%s\n", buffer);
+			} else {
+				rc = fprintf(fp, "\n");
+			}
+		} break;
+
+		case P_WRITE:
+			if (buffer) {
+				rc = fprintf(fp, "%s", buffer);
+			}
+		break;
+
+		/* no formatting on logging output */
+		case P_LOG:
+			if (buffer) {
+				struct timeval tp;
+				if (gettimeofday(&tp, NULL) == SUCCESS) {
+					rc = fprintf(fp, "[%ld %.8F]: %s\n", tp.tv_sec, tp.tv_usec / 1000000.00, buffer);
+				} else {
+					rc = FAILURE;
+				}
+			}
+			break;
+	}
+
+	if (buffer) {
+		efree(buffer);
+	}
+
+	return rc;
+} /* }}} */
+
+PHPDBG_API int phpdbg_rlog(FILE *fp, 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;
+		const time_t tt = tp.tv_sec;
+
+		strftime(friendly, 100, "%a %b %d %T.%%04d %Y", localtime(&tt));
+		asprintf(
+			&buffer, friendly, tp.tv_usec/1000);
+		asprintf(
+			&format, "[%s]: %s\n", buffer, fmt);
+		rc = vfprintf(
+			fp, format, args);
+
+		free(format);
+		free(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;
@@ -226,13 +328,15 @@ PHPDBG_API const phpdbg_color_t *phpdbg_get_color(const char *name, size_t name_
 	while (color && color->name) {
 		if (name_length == color->name_length &&
 			memcmp(name, color->name, name_length) == SUCCESS) {
-			phpdbg_debug("phpdbg_get_color(%s, %lu): %s", name, name_length, color->code);
+			phpdbg_debug(
+				"phpdbg_get_color(%s, %lu): %s", name, name_length, color->code);
 			return color;
 		}
 		++color;
 	}
 
-	phpdbg_debug("phpdbg_get_color(%s, %lu): failed", name, name_length);
+	phpdbg_debug(
+		"phpdbg_get_color(%s, %lu): failed", name, name_length);
 
 	return NULL;
 } /* }}} */
@@ -258,7 +362,7 @@ PHPDBG_API const phpdbg_color_t* phpdbg_get_colors(TSRMLS_D) /* {{{ */
 
 PHPDBG_API int phpdbg_get_element(const char *name, size_t len TSRMLS_DC) {
 	const phpdbg_element_t *element = elements;
-
+	
 	while (element && element->name) {
 		if (len == element->name_length) {
 			if (strncasecmp(name, element->name, len) == SUCCESS) {
@@ -267,7 +371,7 @@ PHPDBG_API int phpdbg_get_element(const char *name, size_t len TSRMLS_DC) {
 		}
 		element++;
 	}
-
+	
 	return PHPDBG_COLOR_INVALID;
 }
 
@@ -316,7 +420,7 @@ PHPDBG_API const char *phpdbg_get_prompt(TSRMLS_D) /* {{{ */
 
 int phpdbg_rebuild_symtable(TSRMLS_D) {
 	if (!EG(active_op_array)) {
-		phpdbg_error("inactive", "type=\"op_array\"", "No active op array!");
+		phpdbg_error("No active op array!");
 		return FAILURE;
 	}
 
@@ -324,7 +428,7 @@ int phpdbg_rebuild_symtable(TSRMLS_D) {
 		zend_rebuild_symbol_table(TSRMLS_C);
 
 		if (!EG(active_symbol_table)) {
-			phpdbg_error("inactive", "type=\"symbol_table\"", "No active symbol table!");
+			phpdbg_error("No active symbol table!");
 			return FAILURE;
 		}
 	}
@@ -334,13 +438,13 @@ int phpdbg_rebuild_symtable(TSRMLS_D) {
 
 PHPDBG_API int phpdbg_get_terminal_width(TSRMLS_D) /* {{{ */
 {
-	int columns;
+	int columns;	
 #ifdef _WIN32
 	CONSOLE_SCREEN_BUFFER_INFO csbi;
 
 	GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
 	columns = csbi.srWindow.Right - csbi.srWindow.Left + 1;
-#elif defined(HAVE_SYS_IOCTL_H) && defined(TIOCGWINSZ)
+#elif defined(HAVE_SYS_IOCTL_H) && defined (TIOCGWINSZ)
 	struct winsize w;
 
 	columns = ioctl(fileno(stdout), TIOCGWINSZ, &w) == 0 ? w.ws_col : 80;
@@ -349,294 +453,3 @@ PHPDBG_API int phpdbg_get_terminal_width(TSRMLS_D) /* {{{ */
 #endif
 	return columns;
 } /* }}} */
-
-PHPDBG_API void phpdbg_set_async_io(int fd) {
-#ifndef _WIN32
-	int flags;
-	fcntl(STDIN_FILENO, F_SETOWN, getpid());
-	flags = fcntl(STDIN_FILENO, F_GETFL);
-	fcntl(STDIN_FILENO, F_SETFL, flags | FASYNC);
-#endif
-}
-
-int phpdbg_safe_class_lookup(const char *name, int name_length, zend_class_entry ***ce TSRMLS_DC) {
-	if (PHPDBG_G(flags) & PHPDBG_IN_SIGNAL_HANDLER) {
-		char *lc_name, *lc_free;
-		int lc_length, ret = FAILURE;
-
-		if (name == NULL || !name_length) {
-			return FAILURE;
-		}
-
-		lc_free = lc_name = emalloc(name_length + 1);
-		zend_str_tolower_copy(lc_name, name, name_length);
-		lc_length = name_length + 1;
-
-		if (lc_name[0] == '\\') {
-			lc_name += 1;
-			lc_length -= 1;
-		}
-
-		phpdbg_try_access {
-			ret = zend_hash_find(EG(class_table), lc_name, lc_length, (void **) &ce);
-		} phpdbg_catch_access {
-			phpdbg_error("signalsegv", "class=\"%.*s\"", "Could not fetch class %.*s, invalid data source", name_length, name);
-		} phpdbg_end_try_access();
-
-		efree(lc_free);
-		return ret;
-	} else {
-		return zend_lookup_class(name, name_length, ce TSRMLS_CC);
-	}
-}
-
-char *phpdbg_get_property_key(char *key) {
-	if (*key != 0) {
-		return key;
-	}
-	return strchr(key + 1, 0) + 1;
-}
-
-static int phpdbg_parse_variable_arg_wrapper(char *name, size_t len, char *keyname, size_t keylen, HashTable *parent, zval **zv, phpdbg_parse_var_func callback TSRMLS_DC) {
-	return callback(name, len, keyname, keylen, parent, zv TSRMLS_CC);
-}
-
-PHPDBG_API int phpdbg_parse_variable(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_func callback, zend_bool silent TSRMLS_DC) {
-	return phpdbg_parse_variable_with_arg(input, len, parent, i, (phpdbg_parse_var_with_arg_func) phpdbg_parse_variable_arg_wrapper, silent, callback TSRMLS_CC);
-}
-
-PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable *parent, size_t i, phpdbg_parse_var_with_arg_func callback, zend_bool silent, void *arg TSRMLS_DC) {
-	int ret = FAILURE;
-	zend_bool new_index = 1;
-	char *last_index;
-	size_t index_len = 0;
-	zval **zv;
-
-	if (len < 2 || *input != '$') {
-		goto error;
-	}
-
-	while (i++ < len) {
-		if (i == len) {
-			new_index = 1;
-		} else {
-			switch (input[i]) {
-				case '[':
-					new_index = 1;
-					break;
-				case ']':
-					break;
-				case '>':
-					if (last_index[index_len - 1] == '-') {
-						new_index = 1;
-						index_len--;
-					}
-					break;
-
-				default:
-					if (new_index) {
-						last_index = input + i;
-						new_index = 0;
-					}
-					if (input[i - 1] == ']') {
-						goto error;
-					}
-					index_len++;
-			}
-		}
-
-		if (new_index && index_len == 0) {
-			HashPosition position;
-			for (zend_hash_internal_pointer_reset_ex(parent, &position);
-			     zend_hash_get_current_data_ex(parent, (void **)&zv, &position) == SUCCESS;
-			     zend_hash_move_forward_ex(parent, &position)) {
-				if (i == len || (i == len - 1 && input[len - 1] == ']')) {
-					zval *key = emalloc(sizeof(zval));
-					size_t namelen;
-					char *name;
-					char *keyname = estrndup(last_index, index_len);
-					zend_hash_get_current_key_zval_ex(parent, key, &position);
-					convert_to_string(key);
-					name = emalloc(i + Z_STRLEN_P(key) + 2);
-					namelen = sprintf(name, "%.*s%s%s", (int)i, input, phpdbg_get_property_key(Z_STRVAL_P(key)), input[len - 1] == ']'?"]":"");
-					efree(key);
-
-					ret = callback(name, namelen, keyname, index_len, parent, zv, arg TSRMLS_CC) == SUCCESS || ret == SUCCESS?SUCCESS:FAILURE;
-				} else if (Z_TYPE_PP(zv) == IS_OBJECT) {
-					phpdbg_parse_variable_with_arg(input, len, Z_OBJPROP_PP(zv), i, callback, silent, arg TSRMLS_CC);
-				} else if (Z_TYPE_PP(zv) == IS_ARRAY) {
-					phpdbg_parse_variable_with_arg(input, len, Z_ARRVAL_PP(zv), i, callback, silent, arg TSRMLS_CC);
-				} else {
-					/* Ignore silently */
-				}
-			}
-			return ret;
-		} else if (new_index) {
-			char last_chr = last_index[index_len];
-			last_index[index_len] = 0;
-			if (zend_symtable_find(parent, last_index, index_len + 1, (void **)&zv) == FAILURE) {
-				if (!silent) {
-					phpdbg_error("variable", "type=\"undefined\" variable=\"%.*s\"", "%.*s is undefined", (int) i, input);
-				}
-				return FAILURE;
-			}
-			last_index[index_len] = last_chr;
-			if (i == len) {
-				char *name = estrndup(input, len);
-				char *keyname = estrndup(last_index, index_len);
-
-				ret = callback(name, len, keyname, index_len, parent, zv, arg TSRMLS_CC) == SUCCESS || ret == SUCCESS?SUCCESS:FAILURE;
-			} else if (Z_TYPE_PP(zv) == IS_OBJECT) {
-				parent = Z_OBJPROP_PP(zv);
-			} else if (Z_TYPE_PP(zv) == IS_ARRAY) {
-				parent = Z_ARRVAL_PP(zv);
-			} else {
-				phpdbg_error("variable", "type=\"notiterable\" variable=\"%.*s\"", "%.*s is nor an array nor an object", (int) i, input);
-				return FAILURE;
-			}
-			index_len = 0;
-		}
-	}
-
-	return ret;
-	error:
-		phpdbg_error("variable", "type=\"invalidinput\"", "Malformed input");
-		return FAILURE;
-}
-
-static int phpdbg_xml_array_element_dump(zval **zv TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) {
-	phpdbg_xml("<element");
-
-	phpdbg_try_access {
-		if (hash_key->nKeyLength == 0) { /* numeric key */
-			phpdbg_xml(" name=\"%ld\"", hash_key->h);
-		} else { /* string key */
-			phpdbg_xml(" name=\"%.*s\"", hash_key->nKeyLength - 1, hash_key->arKey);
-		}
-	} phpdbg_catch_access {
-		phpdbg_xml(" severity=\"error\" ></element>");
-		return 0;
-	} phpdbg_end_try_access();
-
-	phpdbg_xml(">");
-
-	phpdbg_xml_var_dump(zv TSRMLS_CC);
-
-	phpdbg_xml("</element>");
-
-	return 0;
-}
-
-static int phpdbg_xml_object_property_dump(zval **zv TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) {
-	phpdbg_xml("<property");
-
-	phpdbg_try_access {
-		if (hash_key->nKeyLength == 0) { /* numeric key */
-			phpdbg_xml(" name=\"%ld\"", hash_key->h);
-		} else { /* string key */
-			const char *prop_name, *class_name;
-			int unmangle = zend_unmangle_property_name(hash_key->arKey, hash_key->nKeyLength - 1, &class_name, &prop_name);
-
-			if (class_name && unmangle == SUCCESS) {
-				phpdbg_xml(" name=\"%s\"", prop_name);
-				if (class_name[0] == '*') {
-					phpdbg_xml(" protection=\"protected\"");
-				} else {
-					phpdbg_xml(" class=\"%s\" protection=\"private\"", class_name);
-				}
-			} else {
-				phpdbg_xml(" name=\"%.*s\" protection=\"public\"", hash_key->nKeyLength - 1, hash_key->arKey);
-			}
-		}
-	} phpdbg_catch_access {
-		phpdbg_xml(" severity=\"error\" ></property>");
-		return 0;
-	} phpdbg_end_try_access();
-
-	phpdbg_xml(">");
-
-	phpdbg_xml_var_dump(zv TSRMLS_CC);
-
-	phpdbg_xml("</property>");
-
-	return 0;
-}
-
-#define COMMON (Z_ISREF_PP(zv) ? "&" : "")
-
-PHPDBG_API void phpdbg_xml_var_dump(zval **zv TSRMLS_DC) {
-	HashTable *myht;
-	const char *class_name;
-	zend_uint class_name_len;
-	int (*element_dump_func)(zval** TSRMLS_DC, int, va_list, zend_hash_key*);
-	int is_temp;
-
-	phpdbg_try_access {
-		switch (Z_TYPE_PP(zv)) {
-			case IS_BOOL:
-				phpdbg_xml("<bool refstatus=\"%s\" value=\"%s\" />", COMMON, Z_LVAL_PP(zv) ? "true" : "false");
-				break;
-			case IS_NULL:
-				phpdbg_xml("<null refstatus=\"%s\" />", COMMON);
-				break;
-			case IS_LONG:
-				phpdbg_xml("<int refstatus=\"%s\" value=\"%ld\" />", COMMON, Z_LVAL_PP(zv));
-				break;
-			case IS_DOUBLE:
-				phpdbg_xml("<float refstatus=\"%s\" value=\"%.*G\" />", COMMON, (int) EG(precision), Z_DVAL_PP(zv));
-				break;
-			case IS_STRING:
-				phpdbg_xml("<string refstatus=\"%s\" length=\"%d\" value=\"%.*s\" />", COMMON, Z_STRLEN_PP(zv), Z_STRLEN_PP(zv), Z_STRVAL_PP(zv));
-					break;
-			case IS_ARRAY:
-				myht = Z_ARRVAL_PP(zv);
-				if (++myht->nApplyCount > 1) {
-					phpdbg_xml("<recursion />");
-					--myht->nApplyCount;
-					break;
-				}
-				phpdbg_xml("<array refstatus=\"%s\" num=\"%d\">", COMMON, zend_hash_num_elements(myht));
-				element_dump_func = phpdbg_xml_array_element_dump;
-				is_temp = 0;
-				goto head_done;
-			case IS_OBJECT:
-				myht = Z_OBJDEBUG_PP(zv, is_temp);
-				if (myht && ++myht->nApplyCount > 1) {
-					phpdbg_xml("<recursion />");
-					--myht->nApplyCount;
-					break;
-				}
-	
-				if (Z_OBJ_HANDLER(**zv, get_class_name)) {
-					Z_OBJ_HANDLER(**zv, get_class_name)(*zv, &class_name, &class_name_len, 0 TSRMLS_CC);
-					phpdbg_xml("<object refstatus=\"%s\" class=\"%s\" id=\"%d\" num=\"%d\">", COMMON, class_name, Z_OBJ_HANDLE_PP(zv), myht ? zend_hash_num_elements(myht) : 0);
-					efree((char*)class_name);
-				} else {
-					phpdbg_xml("<object refstatus=\"%s\" class=\"\" id=\"%d\" num=\"%d\">", COMMON, Z_OBJ_HANDLE_PP(zv), myht ? zend_hash_num_elements(myht) : 0);
-				}
-				element_dump_func = phpdbg_xml_object_property_dump;
-head_done:
-				if (myht) {
-					zend_hash_apply_with_arguments(myht TSRMLS_CC, (apply_func_args_t) element_dump_func, 0);
-					--myht->nApplyCount;
-					if (is_temp) {
-						zend_hash_destroy(myht);
-						efree(myht);
-					}
-				}
-				if (Z_TYPE_PP(zv) == IS_ARRAY) {
-					phpdbg_xml("</array>");
-				} else {
-					phpdbg_xml("</object>");
-				}
-				break;
-			case IS_RESOURCE: {
-				const char *type_name = zend_rsrc_list_get_rsrc_type(Z_LVAL_PP(zv) TSRMLS_CC);
-				phpdbg_xml("<resource refstatus=\"%s\" id=\"%ld\" type=\"%ld\" />", COMMON, Z_LVAL_PP(zv), type_name ? type_name : "unknown");
-				break;
-			}
-			default:
-				break;
-		}
-	} phpdbg_end_try_access();
-}