diff options
| author | pooryorick <com.digitalsmarties@pooryorick.com> | 2019-10-22 19:21:48 (GMT) |
|---|---|---|
| committer | pooryorick <com.digitalsmarties@pooryorick.com> | 2019-10-22 19:21:48 (GMT) |
| commit | 566db2779b71036ff40e31affc73126c2a090773 (patch) | |
| tree | 590ddf2c16afa55c810ad08dad8c92fbad62ed59 /generic/tclFileName.c | |
| parent | 1ce018ea85386566dd65a3b924bc59c6617afe2b (diff) | |
| parent | 2f8cb2ab854a2e311b49c8276bb59a76adaeafeb (diff) | |
| download | tcl-566db2779b71036ff40e31affc73126c2a090773.zip tcl-566db2779b71036ff40e31affc73126c2a090773.tar.gz tcl-566db2779b71036ff40e31affc73126c2a090773.tar.bz2 | |
Fix for [bcd1004104]
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 3419d7c..053812e 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -2437,7 +2437,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) { @@ -2470,7 +2471,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) { |