diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-06-22 13:26:31 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-06-22 13:26:31 (GMT) |
| commit | a0af7d5841f6a8fbf03f748e9e1a5827a29d6a6a (patch) | |
| tree | 0399533a04774cd225f1e61c826c6b04e0981618 /generic/tclPathObj.c | |
| parent | 9a0f3fc06f63ce3a77d1257877bc079fa5d33d99 (diff) | |
| parent | f57dacd4955b9dd474cfd9d4e4d55cac22990f6c (diff) | |
| download | tcl-unwanted.zip tcl-unwanted.tar.gz tcl-unwanted.tar.bz2 | |
merge trunkunwanted
Diffstat (limited to 'generic/tclPathObj.c')
| -rw-r--r-- | generic/tclPathObj.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c index 68ec2c4..5984c16 100644 --- a/generic/tclPathObj.c +++ b/generic/tclPathObj.c @@ -921,7 +921,17 @@ TclJoinPath( if (res != NULL) { TclDecrRefCount(res); } - return TclNewFSPathObj(elt, str, len); + + if (PATHFLAGS(elt)) { + return TclNewFSPathObj(elt, str, len); + } + if (TCL_PATH_ABSOLUTE != Tcl_FSGetPathType(elt)) { + return TclNewFSPathObj(elt, str, len); + } + (void) Tcl_FSGetNormalizedPath(NULL, elt); + if (elt == PATHOBJ(elt)->normPathPtr) { + return TclNewFSPathObj(elt, str, len); + } } } @@ -948,6 +958,7 @@ TclJoinPath( } } strElt = TclGetStringFromObj(elt, &strEltLen); + driveNameLength = 0; type = TclGetPathType(elt, &fsPtr, &driveNameLength, &driveName); if (type != TCL_PATH_RELATIVE) { /* @@ -1003,6 +1014,12 @@ TclJoinPath( } } ptr = strElt; + /* [Bug f34cf83dd0] */ + if (driveNameLength > 0) { + if (ptr[0] == '/' && ptr[-1] == '/') { + goto noQuickReturn; + } + } while (*ptr != '\0') { if (*ptr == '/' && (ptr[1] == '/' || ptr[1] == '\0')) { /* @@ -2608,7 +2625,7 @@ UpdateStringOfFsPath( pathPtr->bytes = TclGetStringFromObj(copy, &cwdLen); pathPtr->length = cwdLen; - copy->bytes = tclEmptyStringRep; + copy->bytes = &tclEmptyString; copy->length = 0; TclDecrRefCount(copy); } |