diff options
| author | dgp <dgp@users.sourceforge.net> | 2013-02-05 16:54:29 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2013-02-05 16:54:29 (GMT) |
| commit | eec7311e640b711577933860dec1c5cd2d2f59c6 (patch) | |
| tree | 6d70584b762fe5b3a37dafa7840d3c86c61c2e4b /win/tclWinFile.c | |
| parent | 970473c68812eb7f94e71c857d4d80e36d44c0e3 (diff) | |
| parent | 4a235274c959ab1f0e0fecd1f3db2f4c07461b79 (diff) | |
| download | tcl-eec7311e640b711577933860dec1c5cd2d2f59c6.zip tcl-eec7311e640b711577933860dec1c5cd2d2f59c6.tar.gz tcl-eec7311e640b711577933860dec1c5cd2d2f59c6.tar.bz2 | |
[Bug 3603434] Make sure TclpObjNormalizePath() properly declares "a:/" to
be normalized, even when no "A:" drive is present on the system.
Diffstat (limited to 'win/tclWinFile.c')
| -rw-r--r-- | win/tclWinFile.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/win/tclWinFile.c b/win/tclWinFile.c index d1078f5..8ea6548 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -2335,6 +2335,12 @@ TclpObjNormalizePath(interp, pathPtr, nextCheckpoint) } Tcl_DStringAppend(&dsNorm, nativePath, len); lastValidPathEnd = currentPathEndPosition; + } else if (nextCheckpoint == 0) { + /* Path starts with a drive designation + * that's not actually on the system. + * We still must normalize up past the + * first separator. [Bug 3603434] */ + currentPathEndPosition++; } } Tcl_DStringFree(&ds); @@ -2417,6 +2423,12 @@ TclpObjNormalizePath(interp, pathPtr, nextCheckpoint) Tcl_DStringAppend(&dsNorm, nativePath, sizeof(WCHAR)*len); lastValidPathEnd = currentPathEndPosition; + } else if (nextCheckpoint == 0) { + /* Path starts with a drive designation + * that's not actually on the system. + * We still must normalize up past the + * first separator. [Bug 3603434] */ + currentPathEndPosition++; } } Tcl_DStringFree(&ds); |