diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-23 10:01:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-23 10:01:11 (GMT) |
| commit | 01498c5ecda9522a8353a016d1ced6352b10e90a (patch) | |
| tree | 3681ae7c61996f42fa8e060f4f7591a5cf529b75 /win/tclWinFile.c | |
| parent | 76da15f7bca905ca03c054f3c568039eb7551e70 (diff) | |
| parent | 2df6f12a996d019b78a31c15f5875e2609fb28b2 (diff) | |
| download | tcl-01498c5ecda9522a8353a016d1ced6352b10e90a.zip tcl-01498c5ecda9522a8353a016d1ced6352b10e90a.tar.gz tcl-01498c5ecda9522a8353a016d1ced6352b10e90a.tar.bz2 | |
Merge 8.6.
Also unbreak windows build, broken since [0f2870649c804dd8].
Diffstat (limited to 'win/tclWinFile.c')
| -rw-r--r-- | win/tclWinFile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 880adc0..d0720ab 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -1095,6 +1095,7 @@ TclpMatchInDirectory( const char *utfname; int checkDrive = 0, isDrive; DWORD attr; + Tcl_Encoding encoding; native = data.cFileName; attr = data.dwFileAttributes; @@ -1132,6 +1133,7 @@ TclpMatchInDirectory( * the system. */ + encoding = Tcl_GetEncoding(interp ,NULL); if (Tcl_StringCaseMatch(utfname, pattern, 1)) { /* * If the file matches, then we need to process the remainder @@ -1150,7 +1152,7 @@ TclpMatchInDirectory( if (NativeMatchType(isDrive, attr, native, types)) { Tcl_ListObjAppendElement(interp, resultPtr, TclNewFSPathObj(pathPtr, utfname, - Tcl_DStringLength(&ds))); + Tcl_DStringLength(&ds), encoding)); } } |