com php-src: - Keep the color: phpdbg_set.c phpdbg_util s.h
| From: | Bob Weinand | Date: | Sun, 24 Nov 2013 15:49:30 +0000 |
| Subject: | com php-src: - Keep the color: phpdbg_set.c phpdbg_util s.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74650@lists.php.net to get a copy of this message | ||
Commit: 19a923de46bf8b8a885605718568743cc956d627
Author: Felipe Pena <felipensp@gmail.com> Sun, 24 Nov 2013 13:49:30 -0200
Parents: c72c2687dadcee9e75d1eb9e914a825c78bab7cc
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=19a923de46bf8b8a885605718568743cc956d627
Log:
- Keep the color
Changed paths:
M phpdbg_set.c
M phpdbg_utils.h
Diff:
diff --git a/phpdbg_set.c b/phpdbg_set.c
index 3f9a262..d8a75a6 100644
--- a/phpdbg_set..c
+++ b/phpdbg_set.c
@@ -30,7 +30,11 @@ void phpdbg_set_prompt(const char *prompt TSRMLS_DC) /* {{{ */
PHPDBG_G(prompt) = NULL;
}
- spprintf(&PHPDBG_G(prompt), 0, "%s ", prompt);
+ if (PHPDBG_IS_COLOURED) {
+ spprintf(&PHPDBG_G(prompt), 0, "\033[1;64m%s\033[0m ", prompt);
+ } else {
+ spprintf(&PHPDBG_G(prompt), 0, "%s ", prompt);
+ }
} /* }}} */
const char *phpdbg_get_prompt(TSRMLS_D) /* {{{ */
@@ -62,13 +66,13 @@ PHPDBG_SET(oplog) /* {{{ */
phpdbg_notice(
"Oplog %s", PHPDBG_G(oplog) ? "enabled" : "disabled");
break;
-
+
case NUMERIC_PARAM: switch (param->num) {
case 1:
phpdbg_error(
"An output file must be provided to enable oplog");
break;
-
+
case 0: {
if (PHPDBG_G(oplog)) {
phpdbg_notice("Disabling oplog");
@@ -77,7 +81,7 @@ PHPDBG_SET(oplog) /* {{{ */
} else {
phpdbg_error("Oplog is not enabled !");
}
- } break;
+ } break;
} break;
case STR_PARAM: {
diff --git a/phpdbg_utils.h b/phpdbg_utils.h
index e59a7ed..b014319 100644
--- a/phpdbg_utils.h
+++ b/phpdbg_utils.h
@@ -70,7 +70,7 @@ int phpdbg_print(int TSRMLS_DC, FILE*, const char*, ...) PHP_ATTRIBUTE_FORMAT(pr
#define EMPTY "" /* }}} */
/* {{{ For prompt lines */
-#define PROMPT ((PHPDBG_G(flags) & PHPDBG_IS_COLOURED) ?
"\033[1;64mphpdbg>\033[0m" : "phpdbg>") /* }}} */
+#define PROMPT "phpdbg>" /* }}} */
/* {{{ For separation */
#define SEPARATE "------------------------------------------------" /* }}} */