Merge 8.7

doc/zipfs.3

@@ -61,7 +61,7 @@ follows:
 .IP [1]
 If the current application has a mountable ZIP archive, that archive is
 mounted under \fIZIPFS_VOLUME\fBapp\fR as a read-only Tcl virtual file
-system. \fIZIPFS_VOLUME\fR is \fB//zipfs:/\fR on all platforms.
+system. \fIZIPFS_VOLUME\fR is \fB/zipfs:/\fR on all platforms.
 .IP [2]
 If a file named \fBmain.tcl\fR is located in the root directory of that file
 system (i.e., at \fIZIPROOT\fB/app/main.tcl\fR after the ZIP archive is

doc/zipfs.n

@@ -108,7 +108,7 @@ to access the files inside the mount).
 Returns a constant string which indicates the mount point for zipfs volumes
 for the current platform.
 This value is
-.QW \fB//zipfs:/\fR .
+.QW \fB/zipfs:/\fR .
 .TP
 \fBzipfs unmount \fImountpoint\fR
 .
@@ -244,7 +244,7 @@ close $f
 
 # Launch the executable, printing its output to stdout
 exec $img >@stdout
-#    prints: \fIHi. This is //zipfs:/app/main.tcl\fR
+#    prints: \fIHi. This is /zipfs:/app/main.tcl\fR
 .CE
 .SH "SEE ALSO"
 tclsh(1), file(n), zipfs(3), zlib(n)

generic/tclZipfs.c

@@ -81,8 +81,8 @@ static const z_crc_t* crc32tab;
 ** TIP430 style zipfs prefix
 */
 
-#define ZIPFS_VOLUME	  "//zipfs:/"
-#define ZIPFS_VOLUME_LEN  9
+#define ZIPFS_VOLUME	  "/zipfs:/"
+#define ZIPFS_VOLUME_LEN  8
 #define ZIPFS_APP_MOUNT	  ZIPFS_VOLUME "app"
 #define ZIPFS_ZIP_MOUNT	  ZIPFS_VOLUME "lib/tcl"
 #define ZIPFS_FALLBACK_ENCODING "cp437"
@@ -852,7 +852,6 @@ CanonicalPath(
 #endif /* _WIN32 */
 
     if (haveZipfsPath) {
-	/* UNC style path */
 	if (root && strncmp(root, ZIPFS_VOLUME, ZIPFS_VOLUME_LEN) == 0) {
 	    isVfs = 1;
 	} else if (tail &&