summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-06-06 21:57:28 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-06-06 21:57:28 (GMT)
commit2da308287ac0cb828ac2fd46fa33981a0a80c547 (patch)
tree410338316d61546a6a5132f3e9a1b2362e014fc5 /generic
parent04526fe293b1b59c39461441d8c3ac06218ad187 (diff)
parenta17cc6e7864857dc63ad66ea35f82244d1addeef (diff)
downloadtk-2da308287ac0cb828ac2fd46fa33981a0a80c547.zip
tk-2da308287ac0cb828ac2fd46fa33981a0a80c547.tar.gz
tk-2da308287ac0cb828ac2fd46fa33981a0a80c547.tar.bz2
Restore proper NUL output to the [console]. [Bug 2546087]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkConsole.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index bdf6ccd..f996361 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -509,7 +509,22 @@ ConsoleOutput(
Tcl_Interp *consoleInterp = info->consoleInterp;
if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
+ Tcl_DString ds;
+ Tcl_Encoding utf8 = Tcl_GetEncoding(NULL, "utf-8");
+
+ /*
+ * Not checking for utf8 == NULL. Did not check for TCL_ERROR
+ * from Tcl_SetChannelOption() in Tk_InitConsoleChannels() either.
+ * Assumption is utf-8 Tcl_Encoding is reliably present.
+ */
+
+ CONST char *bytes
+ = Tcl_ExternalToUtfDString(utf8, buf, toWrite, &ds);
+ int numBytes = Tcl_DStringLength(&ds);
Tcl_Obj *cmd = Tcl_NewStringObj("tk::ConsoleOutput", -1);
+
+ Tcl_FreeEncoding(utf8);
+
if (data->type == TCL_STDERR) {
Tcl_ListObjAppendElement(NULL, cmd,
Tcl_NewStringObj("stderr", -1));
@@ -517,7 +532,10 @@ ConsoleOutput(
Tcl_ListObjAppendElement(NULL, cmd,
Tcl_NewStringObj("stdout", -1));
}
- Tcl_ListObjAppendElement(NULL, cmd, Tcl_NewStringObj(buf, toWrite));
+ Tcl_ListObjAppendElement(NULL, cmd,
+ Tcl_NewStringObj(bytes, numBytes));
+
+ Tcl_DStringFree(&ds);
Tcl_IncrRefCount(cmd);
Tcl_GlobalEvalObj(consoleInterp, cmd);
Tcl_DecrRefCount(cmd);