diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2015-06-29 02:51:10 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2015-06-29 02:51:10 +0200 |
| commit | 088f589f7d5aa24a8c42fea582dc53b8cb7232c2 (patch) | |
| tree | 97e9052ee449a2cbecf5a2fa0646177a2ada6f81 /sapi/phpdbg/phpdbg_utils.c | |
| parent | f500471e8c27af61e3c213d183e583b49d8b42ee (diff) | |
| download | php-git-088f589f7d5aa24a8c42fea582dc53b8cb7232c2.tar.gz | |
Make backtraces *much* more readable
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 4cd8ce2782..0d03c3cdd4 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -24,6 +24,7 @@ #include "phpdbg.h" #include "phpdbg_opcode.h" #include "phpdbg_utils.h" +#include "ext/standard/php_string.h" #if defined(HAVE_SYS_IOCTL_H) # include "sys/ioctl.h" @@ -756,3 +757,62 @@ PHPDBG_API zend_bool phpdbg_check_caught_ex(zend_execute_data *execute_data, zen return op->opcode == ZEND_CATCH; } + +char *phpdbg_short_zval_print(zval *zv, int maxlen) /* {{{ */ +{ + char *decode = NULL; + + switch (Z_TYPE_P(zv)) { + case IS_UNDEF: + decode = zend_strndup("", 0); + break; + case IS_NULL: + decode = zend_strndup(ZEND_STRL("null")); + break; + case IS_FALSE: + decode = zend_strndup(ZEND_STRL("false")); + break; + case IS_TRUE: + decode = zend_strndup(ZEND_STRL("true")); + break; + case IS_LONG: + asprintf(&decode, ZEND_ULONG_FMT, Z_LVAL_P(zv)); + break; + case IS_DOUBLE: + asprintf(&decode, "%.*G", 14, Z_DVAL_P(zv)); + break; + case IS_STRING: { + int i; + zend_string *str = php_addcslashes(Z_STR_P(zv), 0, "\\\"", 2); + for (i = 0; i < str->len; i++) { + if (str->val[i] < 32) { + str->val[i] = ' '; + } + } + asprintf(&decode, "\"%.*s\"%c", str->len <= maxlen - 2 ? (int) str->len : (maxlen - 3), str->val, str->len <= maxlen - 2 ? 0 : '+'); + zend_string_release(str); + } break; + case IS_RESOURCE: + asprintf(&decode, "Rsrc #%d", Z_RES_HANDLE_P(zv)); + break; + case IS_ARRAY: + asprintf(&decode, "array(%d)", zend_hash_num_elements(Z_ARR_P(zv))); + break; + case IS_OBJECT: { + zend_string *str = Z_OBJCE_P(zv)->name; + asprintf(&decode, "%.*s%c", str->len <= maxlen ? (int) str->len : maxlen - 1, str->val, str->len <= maxlen ? 0 : '+'); + break; + } + case IS_CONSTANT: + decode = zend_strndup(ZEND_STRL("<constant>")); + break; + case IS_CONSTANT_AST: + decode = zend_strndup(ZEND_STRL("<ast>")); + break; + default: + asprintf(&decode, "unknown type: %d", Z_TYPE_P(zv)); + break; + } + + return decode; +} /* }}} */ |