summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-06-23 15:43:41 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-06-23 15:43:41 (GMT)
commita03ebed0be693c57b441bac89d1d48a77bce0bc4 (patch)
treeb398311e18c9d4df1f56edb46a2c448f9f2ba7b1
parent0cc32b6dffd4788b282213175da265ad8d8edd2b (diff)
downloadtcl-a03ebed0be693c57b441bac89d1d48a77bce0bc4.zip
tcl-a03ebed0be693c57b441bac89d1d48a77bce0bc4.tar.gz
tcl-a03ebed0be693c57b441bac89d1d48a77bce0bc4.tar.bz2
* generic/tclIOUtil.c: Fixed bug in Tcl_GetTranslatedPath() when
operating on the "Special path" variant of the "path" Tcl_ObjType intrep. A full normalization was getting done, in particular, coercing relative paths to absolute, contrary to what the function of producing the "translated path" is supposed to do. [Bug 1972879].
-rw-r--r--ChangeLog8
-rw-r--r--generic/tclIOUtil.c13
2 files changed, 19 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e7c1544..7a2e266 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-23 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclIOUtil.c: Fixed bug in Tcl_GetTranslatedPath() when
+ operating on the "Special path" variant of the "path" Tcl_ObjType
+ intrep. A full normalization was getting done, in particular, coercing
+ relative paths to absolute, contrary to what the function of
+ producing the "translated path" is supposed to do. [Bug 1972879].
+
2008-06-20 Don Porter <dgp@users.sourceforge.net>
* tests/binary.test: Corrected flawed tests revealed by a -debug 1
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index aae1e84..19a7729 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -17,7 +17,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.35 2007/12/14 02:29:21 hobbs Exp $
+ * RCS: @(#) $Id: tclIOUtil.c,v 1.77.2.36 2008/06/23 15:43:42 dgp Exp $
*/
#include "tclInt.h"
@@ -5434,7 +5434,16 @@ Tcl_FSGetTranslatedPath(interp, pathPtr)
srcFsPathPtr = (FsPath*) PATHOBJ(pathPtr);
if (srcFsPathPtr->translatedPathPtr == NULL) {
if (PATHFLAGS(pathPtr) != 0) {
- retObj = Tcl_FSGetNormalizedPath(interp, pathPtr);
+ /*
+ * We lack a translated path result, but we have a directory
+ * (cwdPtr) and a tail (normPathPtr), and if we join the
+ * translated version of cwdPtr to normPathPtr, we'll get the
+ * translated result we need, and can store it for future use.
+ */
+ retObj = Tcl_FSJoinToPath(Tcl_FSGetTranslatedPath(interp,
+ srcFsPathPtr->cwdPtr), 1, &(srcFsPathPtr->normPathPtr));
+ srcFsPathPtr->translatedPathPtr = retObj;
+ Tcl_IncrRefCount(retObj);
} else {
/*
* It is a pure absolute, normalized path object.