summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2009-02-20 18:19:15 (GMT)
committerdgp <dgp@users.sourceforge.net>2009-02-20 18:19:15 (GMT)
commitcabffe92aa625b6d83881d3f28857b4c50775aa5 (patch)
tree7e83d0300e335428ad187891e7a59bd4aaa8a793 /generic
parent0c058bc1950888b1d4c5744c7f4a26698ff3606b (diff)
downloadtcl-cabffe92aa625b6d83881d3f28857b4c50775aa5.zip
tcl-cabffe92aa625b6d83881d3f28857b4c50775aa5.tar.gz
tcl-cabffe92aa625b6d83881d3f28857b4c50775aa5.tar.bz2
* 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].
Diffstat (limited to 'generic')
-rw-r--r--generic/tclPathObj.c11
1 files changed, 10 insertions, 1 deletions
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);