diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-02-03 08:45:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2016-02-03 08:45:48 (GMT) |
| commit | 89df729bbb02e4bab86f58d464219eb1978e2b42 (patch) | |
| tree | aad83227050d3fc352558e0158ae131f6e737f96 /generic | |
| parent | 67dc2bddbd043effb0dbdda46c359c7f28f4b5a8 (diff) | |
| download | tk-89df729bbb02e4bab86f58d464219eb1978e2b42.zip tk-89df729bbb02e4bab86f58d464219eb1978e2b42.tar.gz tk-89df729bbb02e4bab86f58d464219eb1978e2b42.tar.bz2 | |
Backout [477949] for Tk 8.5, after discussion in TclCore mailing list: option readfile cannot use multibytes.
FossilOrigin-Name: 4529e367e8ef1e592f8c7096bb6d55073424635c
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkOption.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/generic/tkOption.c b/generic/tkOption.c index 17989f8..95b140d 100644 --- a/generic/tkOption.c +++ b/generic/tkOption.c @@ -1086,7 +1086,7 @@ ReadOptionFile( char *buffer; int result, bufferSize; Tcl_Channel chan; - Tcl_DString newName, optString; + Tcl_DString newName; /* * Prevent file system access in a safe interpreter. @@ -1136,16 +1136,7 @@ ReadOptionFile( } Tcl_Close(NULL, chan); buffer[bufferSize] = 0; - if ((bufferSize>2) && !memcmp(buffer, "\357\273\277", 3)) { - /* File starts with UTF-8 BOM */ - result = AddFromString(interp, tkwin, buffer+3, priority); - } else { - Tcl_DStringInit(&optString); - Tcl_ExternalToUtfDString(NULL, buffer, bufferSize, &optString); - result = AddFromString(interp, tkwin, Tcl_DStringValue(&optString), - priority); - Tcl_DStringFree(&optString); - } + result = AddFromString(interp, tkwin, buffer, priority); ckfree(buffer); return result; } |