From 63e53c8ca801eb7a5f15bee9a8bdb911870ca435 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Sun, 24 Nov 2013 18:11:54 -0200 Subject: [PATCH] - Added yellow color --- phpdbg_utils.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/phpdbg_utils.c b/phpdbg_utils.c index 17bc04ca42..de3342b274 100644 --- a/phpdbg_utils.c +++ b/phpdbg_utils.c @@ -35,7 +35,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg); /* {{{ color structures */ const static phpdbg_color_t colors[] = { PHPDBG_COLOR_D("none", "0;0"), - + PHPDBG_COLOR_D("white", "0;64"), PHPDBG_COLOR_D("white-bold", "1;64"), PHPDBG_COLOR_D("red", "0;31"), @@ -48,6 +48,8 @@ const static phpdbg_color_t colors[] = { PHPDBG_COLOR_D("purple-bold", "1;35"), PHPDBG_COLOR_D("cyan", "0;36"), PHPDBG_COLOR_D("cyan-bold", "1;36"), + PHPDBG_COLOR_D("yellow", "0;33"), + PHPDBG_COLOR_D("yellow-bold", "1;33"), PHPDBG_COLOR_END }; /* }}} */ @@ -179,8 +181,8 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, FILE *fp, const char *format, .. switch (type) { case P_ERROR: if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) { - rc = fprintf(fp, - "\033[%sm[%s]\033[0m\n", + rc = fprintf(fp, + "\033[%sm[%s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, buffer); } else { rc = fprintf(fp, "[%s]\n", buffer); @@ -189,8 +191,8 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, FILE *fp, const char *format, .. case P_NOTICE: if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) { - rc = fprintf(fp, - "\033[%sm[%s]\033[0m\n", + rc = fprintf(fp, + "\033[%sm[%s]\033[0m\n", PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, buffer); } else { rc = fprintf(fp, "[%s]\n", buffer); @@ -229,7 +231,7 @@ PHPDBG_API int phpdbg_print(int type TSRMLS_DC, FILE *fp, const char *format, .. PHPDBG_API const phpdbg_color_t* phpdbg_get_color(const char *name, size_t name_length TSRMLS_DC) /* {{{ */ { const phpdbg_color_t *color = colors; - + while (color && color->name) { if (name_length == color->name_length && memcmp(name, color->name, name_length) == SUCCESS) { @@ -239,10 +241,10 @@ PHPDBG_API const phpdbg_color_t* phpdbg_get_color(const char *name, size_t name_ } ++color; } - + phpdbg_debug( "phpdbg_get_color(%s, %lu): failed", name, name_length); - + return NULL; } /* }}} */ @@ -271,7 +273,7 @@ PHPDBG_API void phpdbg_set_prompt(const char *prompt TSRMLS_DC) /* {{{ */ free(PHPDBG_G(prompt)[0]); PHPDBG_G(prompt)[0] = NULL; } - + /* copy new prompt */ PHPDBG_G(prompt)[0] = strdup(prompt); } /* }}} */ @@ -282,18 +284,18 @@ PHPDBG_API const char *phpdbg_get_prompt(TSRMLS_D) /* {{{ */ if (PHPDBG_G(prompt)[1]) { return PHPDBG_G(prompt)[1]; } - + /* create cached prompt */ if ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED)) { - asprintf( + asprintf( &PHPDBG_G(prompt)[1], "\033[%sm%s\033[0m ", PHPDBG_G(colors)[PHPDBG_COLOR_PROMPT]->code, PHPDBG_G(prompt)[0]); } else { - asprintf( + asprintf( &PHPDBG_G(prompt)[1], "%s ", PHPDBG_G(prompt)[0]); } - + return PHPDBG_G(prompt)[1]; } /* }}} */ -- 2.40.0