diff options
| author | dgp@users.sourceforge.net <dgp> | 2011-06-06 21:56:23 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2011-06-06 21:56:23 (GMT) |
| commit | 290af503e3b2645b9f1ba8582fe37420039bdfa4 (patch) | |
| tree | 05ea88391e7c605bfd393af9b27984b77049cc66 /generic | |
| parent | 12458d6ccd8a5c94e653dcbd44d0f03809097af2 (diff) | |
| download | tk-290af503e3b2645b9f1ba8582fe37420039bdfa4.zip tk-290af503e3b2645b9f1ba8582fe37420039bdfa4.tar.gz tk-290af503e3b2645b9f1ba8582fe37420039bdfa4.tar.bz2 | |
Restore proper NUL output to the [console]. [Bug 2546087]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkConsole.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/generic/tkConsole.c b/generic/tkConsole.c index 13e755e..b7314b0 100644 --- a/generic/tkConsole.c +++ b/generic/tkConsole.c @@ -534,7 +534,22 @@ ConsoleOutput(instanceData, buf, toWrite, errorCode) 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)); @@ -542,7 +557,10 @@ ConsoleOutput(instanceData, buf, toWrite, errorCode) 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); |