summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-10-31 17:04:31 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-10-31 17:04:31 (GMT)
commitf756b0c2a727168bdc397f67c905951991e35a32 (patch)
tree4dc6dab0786e1ed7df03bb95f5447f08f2c66792
parent14fe352f86796bc2af0c6cf75980841e3c39eb3f (diff)
downloadtcl-f756b0c2a727168bdc397f67c905951991e35a32.zip
tcl-f756b0c2a727168bdc397f67c905951991e35a32.tar.gz
tcl-f756b0c2a727168bdc397f67c905951991e35a32.tar.bz2
Purge the old, buggy implementation.bug_3414754
-rw-r--r--generic/tclPathObj.c34
1 files changed, 0 insertions, 34 deletions
diff --git a/generic/tclPathObj.c b/generic/tclPathObj.c
index ab5c4e6..eb19096 100644
--- a/generic/tclPathObj.c
+++ b/generic/tclPathObj.c
@@ -1367,7 +1367,6 @@ AppendPath(
const char *bytes;
Tcl_Obj *copy = Tcl_DuplicateObj(head);
-#if 1
/*
* This is likely buggy when dealing with virtual filesystem drivers
* that use some character other than "/" as a path separator. I know
@@ -1382,39 +1381,6 @@ AppendPath(
} else {
TclpNativeJoinPath(copy, bytes);
}
-#else
- bytes = Tcl_GetStringFromObj(copy, &numBytes);
-
- /*
- * Should we perhaps use 'Tcl_FSPathSeparator'? But then what about the
- * Windows special case? Perhaps we should just check if cwd is a root
- * volume. We should never get numBytes == 0 in this code path.
- */
-
- switch (tclPlatform) {
- case TCL_PLATFORM_UNIX:
- if (bytes[numBytes-1] != '/') {
- Tcl_AppendToObj(copy, "/", 1);
- }
- break;
-
- case TCL_PLATFORM_WINDOWS:
- /*
- * We need the extra 'numBytes != 2', and ':' checks because a volume
- * relative path doesn't get a '/'. For example 'glob C:*cat*.exe'
- * will return 'C:cat32.exe'
- */
-
- if (bytes[numBytes-1] != '/' && bytes[numBytes-1] != '\\') {
- if (numBytes!= 2 || bytes[1] != ':') {
- Tcl_AppendToObj(copy, "/", 1);
- }
- }
- break;
- }
-
- Tcl_AppendObjToObj(copy, tail);
-#endif
return copy;
}