diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-15 14:07:25 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-04-15 14:07:25 (GMT) |
| commit | 495633568f2ab50817ea65125683cd79de9da091 (patch) | |
| tree | ec65e40204705f3a30697defa8532c28497f7083 /generic/tclIOUtil.c | |
| parent | b54406ffc1f268bdb88f9512f500f04e0bc0be2f (diff) | |
| download | tcl-495633568f2ab50817ea65125683cd79de9da091.zip tcl-495633568f2ab50817ea65125683cd79de9da091.tar.gz tcl-495633568f2ab50817ea65125683cd79de9da091.tar.bz2 | |
Remove some low-value C stack frames.
Diffstat (limited to 'generic/tclIOUtil.c')
| -rw-r--r-- | generic/tclIOUtil.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c index 9905256..3c98128 100644 --- a/generic/tclIOUtil.c +++ b/generic/tclIOUtil.c @@ -1729,9 +1729,12 @@ Tcl_FSEvalFileEx( objPtr = Tcl_NewObj(); Tcl_IncrRefCount(objPtr); - /* Try to read first character of stream, so we can - * check for utf-8 BOM to be handled especially. + + /* + * Try to read first character of stream, so we can check for utf-8 BOM to + * be handled especially. */ + if (Tcl_ReadChars(chan, objPtr, 1, 0) < 0) { Tcl_Close(interp, chan); Tcl_AppendResult(interp, "couldn't read file \"", @@ -1739,10 +1742,12 @@ Tcl_FSEvalFileEx( goto end; } string = Tcl_GetString(objPtr); + /* * If first character is not a BOM, append the remaining characters, - * otherwise replace them [Bug 3466099]. + * otherwise replace them. [Bug 3466099] */ + if (Tcl_ReadChars(chan, objPtr, -1, memcmp(string, "\xef\xbb\xbf", 3)) < 0) { Tcl_Close(interp, chan); @@ -1766,7 +1771,7 @@ Tcl_FSEvalFileEx( */ iPtr->evalFlags |= TCL_EVAL_FILE; - result = Tcl_EvalEx(interp, string, length, 0); + result = TclEvalEx(interp, string, length, 0, 1, NULL, string); /* * Now we have to be careful; the script may have changed the |