com php-src: Merge branch 'master' into xml-protocol: phpdbg.c phpdbg.h phpdbg_cmd.c phpdbg_utils.c
| From: | Bob Weinand | Date: | Wed, 24 Sep 2014 23:22:33 +0000 |
| Subject: | com php-src: Merge branch 'master' into xml-protocol: phpdbg.c phpdbg.h phpdbg_cmd.c phpdbg_utils.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82608@lists.php.net to get a copy of this message | ||
Commit: 67787d7b6d1c413302f2d86aa1f9ba8d50491a3b
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 25 Sep 2014 01:22:33 +0200
Parents: abafb7b4f90006442c10a341f0d9bef44ba3b08a a4c4c3593b04ff21929dd75a50e00e1a4f56e896
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=67787d7b6d1c413302f2d86aa1f9ba8d50491a3b
Log:
Merge branch 'master' into xml-protocol
Conflicts:
phpdbg_utils.c
Changed paths:
MM phpdbg.c
MM phpdbg.h
MM phpdbg_cmd.c
MM phpdbg_utils.c
Diff:
diff --cc phpdbg_cmd.c
index 2e91304,8ca56aa..43f5523
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@@ -808,13 -813,14 +808,14 @@@ disconnect
#if !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDIT)
if (!(PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
- if (!phpdbg_write("%s", phpdbg_get_prompt(TSRMLS_C))) {
+ if (!phpdbg_out("%s", phpdbg_get_prompt(TSRMLS_C))) {
goto disconnect;
}
+ PHPDBG_G(last_was_newline) = 1;
}
-
+
/* note: EOF is ignored */
-readline:
+readline:
if (!fgets(buf, PHPDBG_MAX_CMD, PHPDBG_G(io)[PHPDBG_STDIN])) {
/* the user has gone away */
if ((PHPDBG_G(flags) & PHPDBG_IS_REMOTE)) {
diff --cc phpdbg_utils.c
index 6ff905c,22a7b56..d6b7525
--- a/phpdbg_utils.c
+++ b/phpdbg_utils.c
@@@ -1060,59 -240,46 +1060,78 @@@ static int phpdbg_process_print(FILE *f
switch (type) {
case P_ERROR:
+ severity = "error";
+ if (!PHPDBG_G(last_was_newline)) {
- fprintf(fp, "\n");
++ if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
++ fprintf(fp, "<phpdbg>\n</phpdbg>");
++ } else {
++ fprintf(fp, "\n");
++ }
+ PHPDBG_G(last_was_newline) = 1;
+ }
if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
- rc = fprintf(fp,
- "\033[%sm[%s]\033[0m\n",
- PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, buffer);
+ msgoutlen = asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n",
PHPDBG_G(colors)[PHPDBG_COLOR_ERROR]->code, msglen, msg);
} else {
- rc = fprintf(fp, "[%s]\n", buffer);
+ msgoutlen = asprintf(&msgout, "[%.*s]\n", msglen, msg);
}
- break;
+ break;
case P_NOTICE:
+ severity = "notice";
+ if (!PHPDBG_G(last_was_newline)) {
- fprintf(fp, "\n");
++ if (PHPDBG_G(flags) & PHPDBG_WRITE_XML) {
++ fprintf(fp, "<phpdbg>\n</phpdbg>");
++ } else {
++ fprintf(fp, "\n");
++ }
+ PHPDBG_G(last_was_newline) = 1;
+ }
if (PHPDBG_G(flags) & PHPDBG_IS_COLOURED) {
- rc = fprintf(fp,
- "\033[%sm[%s]\033[0m\n",
- PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, buffer);
+ msgoutlen = asprintf(&msgout, "\033[%sm[%.*s]\033[0m\n",
PHPDBG_G(colors)[PHPDBG_COLOR_NOTICE]->code, msglen, msg);
} else {
- rc = fprintf(fp, "[%s]\n", buffer);
+ msgoutlen = asprintf(&msgout, "[%.*s]\n", msglen, msg);
}
- break;
+ break;
- case P_WRITELN: {
- if (buffer) {
- rc = fprintf(fp, "%s\n", buffer);
+ case P_WRITELN:
+ severity = "normal";
+ if (msg) {
+ msgoutlen = asprintf(&msgout, "%.*s\n", msglen, msg);
} else {
- rc = fprintf(fp, "\n");
+ msgoutlen = 1;
+ msgout = strdup("\n");
}
+ PHPDBG_G(last_was_newline) = 1;
- } break;
+ break;
case P_WRITE:
- if (buffer) {
- rc = fprintf(fp, "%s", buffer);
- PHPDBG_G(last_was_newline) = buffer[strlen(buffer) - 1] == '\n';
+ severity = "normal";
+ if (msg) {
+ msgout = strndup(msg, msglen);
+ msgoutlen = msglen;
++ PHPDBG_G(last_was_newline) = msg[msglen - 1] == '\n';
+ } else {
+ msgoutlen = 0;
+ msgout = strdup("");
+ }
+ 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) {
+ fprintf(fp, "<stream type=\"%s\">", type == P_STDERR ?
"stderr" : "stdout");
+ PHPDBG_G(in_script_xml) = type;
+ }
+ 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);
+ fprintf(fp, "%.*s", buflen, buf);
+ efree(buf);
+ } else {
+ fprintf(fp, "%.*s", msglen, msg);
+ }
+ return msglen;
}
break;