diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-15 12:55:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-12-15 12:55:59 (GMT) |
| commit | c576cbec93fdeaba19970c8f94a26d68c9cc4454 (patch) | |
| tree | 7c4312eacbc921feb888e783a5537487d0b884a3 /generic/tclPathObj.c | |
| parent | a69614b432b2cf0d9fdeb9afcff304bad9b9e51e (diff) | |
| parent | 556dc3036e36d2449fe4feaece94487adfd745b8 (diff) | |
| download | tcl-c576cbec93fdeaba19970c8f94a26d68c9cc4454.zip tcl-c576cbec93fdeaba19970c8f94a26d68c9cc4454.tar.gz tcl-c576cbec93fdeaba19970c8f94a26d68c9cc4454.tar.bz2 | |
merge core-8-branch. Fully functioning now, including with the new vc-reform implementation.
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 49d62dc..2453c46 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -1809,7 +1809,6 @@ Tcl_FSGetNormalizedPath( */ (void) TclGetStringFromObj(dir, &cwdLen); - cwdLen += (Tcl_GetString(copy)[cwdLen] == '/'); /* Normalize the combined string. */ @@ -1831,12 +1830,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. */ |