diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-24 08:45:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-24 08:45:23 (GMT) |
| commit | 8f3937588f711654665287367b562dc619520f00 (patch) | |
| tree | 5b59249467fb969e5992e66caf62440d6134cd37 /unix/tclUnixFile.c | |
| parent | d068a5439521392f3c0e90a2d51e7b2769399359 (diff) | |
| parent | c3353d5a645c33f35445ab3c510dfef988897dd2 (diff) | |
| download | tcl-8f3937588f711654665287367b562dc619520f00.zip tcl-8f3937588f711654665287367b562dc619520f00.tar.gz tcl-8f3937588f711654665287367b562dc619520f00.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 0cc4031..43be4cf 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -365,8 +365,7 @@ TclpMatchInDirectory( * and pattern. If so, add the file to the result. */ - - utfname = Tcl_ExternalToUtfDString(encoding, entryPtr->d_name, -1, + utfname = Tcl_ExternalToUtfDString(NULL, entryPtr->d_name, -1, &utfDs); if (Tcl_StringCaseMatch(utfname, pattern, 0)) { int typeOk = 1; @@ -381,7 +380,7 @@ TclpMatchInDirectory( if (typeOk) { Tcl_ListObjAppendElement(interp, resultPtr, TclNewFSPathObj(pathPtr, utfname, - Tcl_DStringLength(&utfDs), encoding)); + Tcl_DStringLength(&utfDs))); } } Tcl_DStringFree(&utfDs); |