diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-24 07:57:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-10-24 07:57:54 (GMT) |
| commit | c3353d5a645c33f35445ab3c510dfef988897dd2 (patch) | |
| tree | e324bac995b3095c40458e48569929c2510e65e1 /generic/tclFileName.c | |
| parent | 710734302bdc7b1230d0de70b5fed5ccdaffa4bd (diff) | |
| parent | 5837fdc42cd33f9b1f81bc4f75b9dad62b0631b2 (diff) | |
| download | tcl-c3353d5a645c33f35445ab3c510dfef988897dd2.zip tcl-c3353d5a645c33f35445ab3c510dfef988897dd2.tar.gz tcl-c3353d5a645c33f35445ab3c510dfef988897dd2.tar.bz2 | |
Backout [0f2870649c804dd8], since testcase encoding-2.2 fails
Diffstat (limited to 'generic/tclFileName.c')
| -rw-r--r-- | generic/tclFileName.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c index 053812e..3419d7c 100644 --- a/generic/tclFileName.c +++ b/generic/tclFileName.c @@ -2437,8 +2437,7 @@ DoGlob( joinedPtr = TclDStringToObj(&append); } else if (flags) { joinedPtr = TclNewFSPathObj(pathPtr, Tcl_DStringValue(&append), - Tcl_DStringLength(&append), - TclFSPathEncoding(interp, pathPtr)); + Tcl_DStringLength(&append)); } else { joinedPtr = Tcl_DuplicateObj(pathPtr); if (strchr(separators, Tcl_DStringValue(&append)[0]) == NULL) { @@ -2471,8 +2470,7 @@ DoGlob( if (pathPtr == NULL) { joinedPtr = Tcl_NewStringObj(pattern, p-pattern); } else if (flags) { - joinedPtr = TclNewFSPathObj(pathPtr, pattern, p-pattern, - TclFSPathEncoding(interp, pathPtr)); + joinedPtr = TclNewFSPathObj(pathPtr, pattern, p-pattern); } else { joinedPtr = Tcl_DuplicateObj(pathPtr); if (strchr(separators, pattern[0]) == NULL) { |