diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-12-06 13:16:33 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-12-06 13:16:33 (GMT) |
| commit | fb62f4567b7cc6ffd5944d5eac6e16d7eb5d34cf (patch) | |
| tree | 98988ccc5abdbf62a817f9cd07f94638959fd3b4 /generic/tclPathObj.c | |
| parent | 49e332ded25e7502ce49b62bb7ef6b22cdd2e90f (diff) | |
| parent | d7ed3259130eb94a7050d2d66b99c997378c969d (diff) | |
| download | tcl-fb62f4567b7cc6ffd5944d5eac6e16d7eb5d34cf.zip tcl-fb62f4567b7cc6ffd5944d5eac6e16d7eb5d34cf.tar.gz tcl-fb62f4567b7cc6ffd5944d5eac6e16d7eb5d34cf.tar.bz2 | |
merge 8.7
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index be3d57c..e9d2fcb 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -1748,7 +1748,6 @@ Tcl_FSGetNormalizedPath( */ (void) TclGetStringFromObj(dir, &cwdLen); - cwdLen += (Tcl_GetString(copy)[cwdLen] == '/'); /* Normalize the combined string. */ @@ -1770,12 +1769,12 @@ Tcl_FSGetNormalizedPath( * normalized head, we can more efficiently normalize the combined * path by passing over only the unnormalized tail portion. When * this is sufficient, prior developers claim this should be much - * faster. We use 'cwdLen-1' so that we are already pointing at + * faster. We use 'cwdLen' so that we are already pointing at * the dir-separator that we know about. The normalization code * will actually start off directly after that separator. */ - TclFSNormalizeToUniquePath(interp, copy, cwdLen-1); + TclFSNormalizeToUniquePath(interp, copy, cwdLen); } /* Now we need to construct the new path object. */ |