From cabffe92aa625b6d83881d3f28857b4c50775aa5 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 20 Feb 2009 18:19:15 +0000
Subject:         * generic/tclPathObj.c: Fixed mistaken logic in
 TclFSGetPathType()         * tests/fileName.test:  that assumed (not
 "absolute" => "relative").         This is a false assumption on Windows,
 where "volumerelative" is         another possibility.  [Bug 2571597].

---
 ChangeLog            |  7 +++++++
 generic/tclPathObj.c | 11 ++++++++++-
 tests/fileName.test  |  8 +++++++-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93b560b..d456acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-02-20  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclPathObj.c:	Fixed mistaken logic in TclFSGetPathType()
+	* tests/fileName.test:	that assumed (not "absolute" => "relative").
+	This is a false assumption on Windows, where "volumerelative" is
+	another possibility.  [Bug 2571597].
+
 2009-02-18  Don Porter  <dgp@users.sourceforge.net>
 
 	* generic/tclStringObj.c:	Simplify the logic of the
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index 74f526a..725f2a9 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.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: tclPathObj.c,v 1.78 2009/02/10 22:49:50 nijtmans Exp $
+ * RCS: @(#) $Id: tclPathObj.c,v 1.79 2009/02/20 18:19:16 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -511,7 +511,16 @@ TclFSGetPathType(
     }
 
     if (PATHFLAGS(pathPtr) == 0) {
+	/* The path is not absolute... */
+#ifdef __WIN32__
+	/* ... on Windows we must make another call to determine whether
+	 * it's relative or volumerelative [Bug 2571597]. */
+	return TclGetPathType(pathPtr, filesystemPtrPtr, driveNameLengthPtr,
+		NULL);
+#else
+	/* On other systems, quickly deduce !absolute -> relative */
 	return TCL_PATH_RELATIVE;
+#endif
     }
     return TclFSGetPathType(fsPathPtr->cwdPtr, filesystemPtrPtr,
 	    driveNameLengthPtr);
diff --git a/tests/fileName.test b/tests/fileName.test
index 1d1f3ce..c40b8ac 100644
--- a/tests/fileName.test
+++ b/tests/fileName.test
@@ -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: fileName.test,v 1.57 2008/09/29 16:03:30 dgp Exp $
+# RCS: @(#) $Id: fileName.test,v 1.58 2009/02/20 18:19:16 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -1443,6 +1443,12 @@ test filename-17.2 {windows specific glob with executable} -body {
     removeFile execglob/abc.notexecutable
     removeDirectory execglob
 } -result {abc.exe}
+test filename-17.3 {Bug 2571597} win {
+    set p /a
+    file pathtype $p
+    file normalize $p
+    file pathtype $p
+} volumerelative
 
 test fileName-18.1 {windows - split ADS name correctly} {win} {
     # bug 1194458
-- 
cgit v0.12