From a66b86825a5ac8be8bc3afcb1ad586d10b6c037f Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 28 Mar 2006 10:45:25 +0000
Subject: 	* unix/tclUnixFCmd.c (TclpObjNormalizePath): deal with
 *BSD/Darwin 	realpath() converting relative paths into absolute paths. [Bug
 1064247]

---
 unix/tclUnixFCmd.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index 5d9b7b6..1bba9ee 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixFCmd.c,v 1.52 2006/03/25 01:32:11 das Exp $
+ * RCS: @(#) $Id: tclUnixFCmd.c,v 1.53 2006/03/28 10:45:25 das Exp $
  *
  * Portions of this code were derived from NetBSD source code which has the
  * following copyright notice:
@@ -1884,9 +1884,17 @@ TclpObjNormalizePath(
 	    nativePath = Tcl_UtfToExternalDString(NULL, path,
 		    lastDir-path, &ds);
 	    if (Realpath(nativePath, normPath) != NULL) {
-		nextCheckpoint = lastDir - path;
-		goto wholeStringOk;
+		if (*nativePath != '/' && *normPath == '/') {
+		    /*
+		     * realpath has transformed a relative path into an
+		     * absolute path, we do not know how to handle this.
+		     */
+		} else {
+		    nextCheckpoint = lastDir - path;
+		    goto wholeStringOk;
+		}
 	    }
+	    Tcl_DStringFree(&ds);
 	}
     }
 
-- 
cgit v0.12