summaryrefslogtreecommitdiffstats
path: root/generic/tclFileName.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-07 18:59:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-10-07 18:59:37 (GMT)
commit2799ad9f6c20f61947f9ab30a8a884a0d2e359a6 (patch)
treea1d594e13992b8c511f4e96743170a1ff01699b4 /generic/tclFileName.c
parent622d68eaef01f805e3e214a12128488c505fd3d2 (diff)
parent12f23af5456f4a87b8bc4d58f9dcfc0edf2c9676 (diff)
downloadtcl-2799ad9f6c20f61947f9ab30a8a884a0d2e359a6.zip
tcl-2799ad9f6c20f61947f9ab30a8a884a0d2e359a6.tar.gz
tcl-2799ad9f6c20f61947f9ab30a8a884a0d2e359a6.tar.bz2
Merge 8.7
Diffstat (limited to 'generic/tclFileName.c')
-rw-r--r--generic/tclFileName.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/generic/tclFileName.c b/generic/tclFileName.c
index 9620f8c..b553621 100644
--- a/generic/tclFileName.c
+++ b/generic/tclFileName.c
@@ -413,7 +413,6 @@ TclpGetNativePathType(
if (path[0] == '/') {
++path;
-#if defined(__CYGWIN__) || defined(__QNX__)
/*
* Check for "//" network path prefix
*/
@@ -422,22 +421,10 @@ TclpGetNativePathType(
while (*path && *path != '/') {
++path;
}
-#if defined(__CYGWIN__)
- /* UNC paths need to be followed by a share name */
- if (*path++ && (*path && *path != '/')) {
- ++path;
- while (*path && *path != '/') {
- ++path;
- }
- } else {
- path = origPath + 1;
- }
-#endif
}
-#endif
if (driveNameLengthPtr != NULL) {
/*
- * We need this addition in case the QNX or Cygwin code was used.
+ * We need this addition in case the "//" code was used.
*/
*driveNameLengthPtr = (path - origPath);
@@ -656,7 +643,6 @@ SplitUnixPath(
if (*path == '/') {
Tcl_Obj *rootElt;
++path;
-#if defined(__CYGWIN__) || defined(__QNX__)
/*
* Check for "//" network path prefix
*/
@@ -665,19 +651,7 @@ SplitUnixPath(
while (*path && *path != '/') {
++path;
}
-#if defined(__CYGWIN__)
- /* UNC paths need to be followed by a share name */
- if (*path++ && (*path && *path != '/')) {
- ++path;
- while (*path && *path != '/') {
- ++path;
- }
- } else {
- path = origPath + 1;
- }
-#endif
}
-#endif
rootElt = Tcl_NewStringObj(origPath, path - origPath);
Tcl_ListObjAppendElement(NULL, result, rootElt);
while (*path == '/') {