diff options
| -rw-r--r-- | doc/zipfs.3 | 2 | ||||
| -rw-r--r-- | doc/zipfs.n | 4 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 9 | ||||
| -rw-r--r-- | tests/zipfs.test | 14 |
4 files changed, 14 insertions, 15 deletions
diff --git a/doc/zipfs.3 b/doc/zipfs.3 index c8ee455..7ff7ee2 100644 --- a/doc/zipfs.3 +++ b/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 diff --git a/doc/zipfs.n b/doc/zipfs.n index 5ce8cd2..577be7b 100644 --- a/doc/zipfs.n +++ b/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) diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index cfb0cf7..56a25e3 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -81,10 +81,10 @@ static const z_crc_t* crc32tab; ** TIP430 style zipfs prefix */ -#define ZIPFS_VOLUME "//zipfs:/" -#define ZIPFS_VOLUME_LEN 9 -#define ZIPFS_APP_MOUNT "//zipfs:/app" -#define ZIPFS_ZIP_MOUNT "//zipfs:/lib/tcl" +#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 && diff --git a/tests/zipfs.test b/tests/zipfs.test index bf9c969..6e8b8ba 100644 --- a/tests/zipfs.test +++ b/tests/zipfs.test @@ -280,7 +280,7 @@ test zipfs-4.1 {zipfs lmkimg} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/add.tcl] {} $baseImage zipfs mount ziptest $targetImage try { - list [source $targetImage] [source //zipfs:/ziptest/test/add.tcl] + list [source $targetImage] [source /zipfs:/ziptest/test/add.tcl] } finally { zipfs unmount ziptest } @@ -300,7 +300,7 @@ test zipfs-4.2 {zipfs lmkimg: making an image from an image} -constraints zipfs zipfs lmkimg $targetImage [list $addFile test/ok.tcl] {} $midImage zipfs mount ziptest $targetImage try { - list [glob -tails -directory //zipfs://ziptest/test *.tcl] \ + list [glob -tails -directory /zipfs://ziptest/test *.tcl] \ [if {[file size $midImage] == [file size $targetImage]} { string cat equal } else { @@ -327,7 +327,7 @@ test zipfs-4.3 {zipfs lmkimg: stripping password} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/ok.tcl] {} $midImage zipfs mount ziptest $targetImage try { - glob -tails -directory //zipfs://ziptest/test *.tcl + glob -tails -directory /zipfs://ziptest/test *.tcl } finally { zipfs unmount ziptest } @@ -349,7 +349,7 @@ test zipfs-4.4 {zipfs lmkimg: final password} -constraints zipfs -setup { zipfs lmkimg $targetImage [list $addFile test/ok.tcl] $pass $midImage zipfs mount ziptest $targetImage try { - glob -tails -directory //zipfs://ziptest/test *.tcl + glob -tails -directory /zipfs://ziptest/test *.tcl } finally { zipfs unmount ziptest } @@ -368,18 +368,18 @@ test zipfs-4.5 {zipfs lmkimg: making image from mounted} -constraints zipfs -set } -body { zipfs lmkimg $midImage [list $addFile test/add.tcl] {} $baseImage zipfs mount ziptest $midImage - set f [glob -directory //zipfs://ziptest/test *.tcl] + set f [glob -directory /zipfs://ziptest/test *.tcl] zipfs lmkimg $targetImage [list $f test/ok.tcl] {} $midImage zipfs unmount ziptest zipfs mount ziptest $targetImage - list $f [glob -directory //zipfs://ziptest/test *.tcl] + list $f [glob -directory /zipfs://ziptest/test *.tcl] } -cleanup { zipfs unmount ziptest removeFile $baseImage removeFile $midImage removeFile $targetImage removeFile $addFile -} -result {//zipfs://ziptest/test/add.tcl //zipfs://ziptest/test/ok.tcl} +} -result {/zipfs://ziptest/test/add.tcl /zipfs://ziptest/test/ok.tcl} test zipfs-5.1 {zipfs mount_data: short data} -constraints zipfs -body { zipfs mount_data gorp {} |