diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-22 21:36:21 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-22 21:36:21 (GMT) |
| commit | 8726aabaded70c01ab3fac21162ce53b220b81ea (patch) | |
| tree | 47b050309f5ad0865f97743d42ff1ebb570deb96 /generic/tclFileName.c | |
| parent | d14ab3904746a34a3916f45e037b6df3ecff10fa (diff) | |
| parent | 566db2779b71036ff40e31affc73126c2a090773 (diff) | |
| download | tcl-8726aabaded70c01ab3fac21162ce53b220b81ea.zip tcl-8726aabaded70c01ab3fac21162ce53b220b81ea.tar.gz tcl-8726aabaded70c01ab3fac21162ce53b220b81ea.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 0f3f8b1..bf01c02 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -2440,7 +2440,8 @@ DoGlob( joinedPtr = TclDStringToObj(&append); } else if (flags) { joinedPtr = TclNewFSPathObj(pathPtr, Tcl_DStringValue(&append), - Tcl_DStringLength(&append)); + Tcl_DStringLength(&append), + TclFSPathEncoding(interp, pathPtr)); } else { joinedPtr = Tcl_DuplicateObj(pathPtr); if (strchr(separators, Tcl_DStringValue(&append)[0]) == NULL) { @@ -2473,7 +2474,8 @@ DoGlob( if (pathPtr == NULL) { joinedPtr = Tcl_NewStringObj(pattern, p-pattern); } else if (flags) { - joinedPtr = TclNewFSPathObj(pathPtr, pattern, p-pattern); + joinedPtr = TclNewFSPathObj(pathPtr, pattern, p-pattern, + TclFSPathEncoding(interp, pathPtr)); } else { joinedPtr = Tcl_DuplicateObj(pathPtr); if (strchr(separators, pattern[0]) == NULL) { |