diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-04 21:12:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-04 21:12:59 (GMT) |
| commit | 8f1f56d42b418a9e91029a8c59be886facf7cb21 (patch) | |
| tree | e56c722c99076cf07c7240789f95436896d39eed /generic/tclZipfs.c | |
| parent | cb6c9c4787b898a85c3b1577906d50d0ba793118 (diff) | |
| parent | 600c5b59541d100659c84992a2e118b7eba65e41 (diff) | |
| download | tcl-8f1f56d42b418a9e91029a8c59be886facf7cb21.zip tcl-8f1f56d42b418a9e91029a8c59be886facf7cb21.tar.gz tcl-8f1f56d42b418a9e91029a8c59be886facf7cb21.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclZipfs.c')
| -rw-r--r-- | generic/tclZipfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 667bf27..140e084 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -737,11 +737,11 @@ CountSlashes( *------------------------------------------------------------------------ */ static int IsCryptHeaderValid( - ZipEntry *z, + ZipEntry *z, unsigned char cryptHeader[12] ) { - /* + /* * There are multiple possibilities. The last one or two bytes of the * encryption header should match the last one or two bytes of the * CRC of the file. Or the last byte of the encryption header should @@ -1664,7 +1664,7 @@ ZipFSOpenArchive( goto error; } } - /* + /* * Close the Tcl channel. If the file was mapped, the mapping is * unaffected. It is important to close the channel otherwise there is a * potential chicken and egg issue at finalization time as the channels @@ -2199,7 +2199,7 @@ ListMountPoints( * * Releases all resources associated with a mounted archive. There * must not be any open files in the archive. - * + * * Caller MUST be holding WriteLock() before calling this function. * * Results: @@ -4878,7 +4878,7 @@ InitWritableChannel( goto error_cleanup; } } - + if (mode & O_TRUNC) { /* * Truncate; nothing there. @@ -5260,7 +5260,7 @@ ZipEntryAccess( } else { /* * Even if entry does not exist, could be intermediate dir - * containing a mount point + * containing a mount point */ access = ContainsMountPoint(path, -1) ? 0 : -1; } @@ -5568,9 +5568,9 @@ ZipFSMatchInDirectoryProc( AppendWithPrefix(result, prefixBuf, z->name + strip, -1); } } - } + } if (dirOnly) { - /* + /* * Not found in hash. May be a path that is the ancestor of a mount. * e.g. glob //zipfs:/a/? with mount at //zipfs:/a/b/c. Also have * to be careful about duplicates, such as when another mount is |