diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-12 00:52:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-03-12 00:52:22 (GMT) |
| commit | 49da32e6e4e84c1e3ca79b7fa03f4ee0b78728dd (patch) | |
| tree | 203e75b4378b47f53d7a56c666dc9a9c58447fda | |
| parent | 13c1867fff395e5e53757231480437e45c42b4b2 (diff) | |
| download | tcl-49da32e6e4e84c1e3ca79b7fa03f4ee0b78728dd.zip tcl-49da32e6e4e84c1e3ca79b7fa03f4ee0b78728dd.tar.gz tcl-49da32e6e4e84c1e3ca79b7fa03f4ee0b78728dd.tar.bz2 | |
[Bug 3185609] File normalization corner case of ... broken with -DUNICODE
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | win/tclWinFile.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2011-03-12 Jan Nijtmans <nijtmans@users.sf.net> + + * win/tclWinFile.c: [Bug 3185609] File normalization + corner case of ... broken with -DUNICODE + 2011-03-11 Donal K. Fellows <dkf@users.sf.net> * tests/unixInit.test: Make better use of tcltest2. diff --git a/win/tclWinFile.c b/win/tclWinFile.c index 34be41f..620c454 100644 --- a/win/tclWinFile.c +++ b/win/tclWinFile.c @@ -2776,9 +2776,9 @@ TclpObjNormalizePath( * path segment and continue. */ - Tcl_DStringAppend(&dsNorm, (const char *) - ((WCHAR *)(nativePath + Tcl_DStringLength(&ds)) - - dotLen), (int)(dotLen * sizeof(WCHAR))); + Tcl_DStringAppend(&dsNorm, + ((const char *) nativePath) + Tcl_DStringLength(&ds) + - (dotLen * sizeof(TCHAR)), (int)(dotLen * sizeof(TCHAR))); } else { /* * Normal path. |