diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2023-09-19 11:41:26 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2023-09-19 11:41:26 (GMT) |
| commit | ef9ea15d10ceacfb89e94c3f73a3fab9c3601df1 (patch) | |
| tree | eab7c1ee68928533cb0528cb88ec085fd706bced /generic | |
| parent | 990d47f74d002d7498576c6552192560cb92734e (diff) | |
| download | tcl-ef9ea15d10ceacfb89e94c3f73a3fab9c3601df1.zip tcl-ef9ea15d10ceacfb89e94c3f73a3fab9c3601df1.tar.gz tcl-ef9ea15d10ceacfb89e94c3f73a3fab9c3601df1.tar.bz2 | |
Bugs [14db54d81e], [6183f535c89]. Glob and find on zipfs root
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclZipfs.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 02b0f72..47b294e 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -214,7 +214,6 @@ typedef struct ZipFile { /* * In-core description of file contained in mounted ZIP archive. - * ZIP_ATTR_ */ typedef struct ZipEntry { @@ -232,8 +231,9 @@ typedef struct ZipEntry { int timestamp; /* Modification time */ int isEncrypted; /* True if data is encrypted */ int flags; -#define ZE_F_CRC_COMPARED 0x1 /* If 1, the CRC has been compared. */ -#define ZE_F_CRC_CORRECT 0x2 /* Only meaningful if ZE_F_CRC_COMPARED is 1 */ +#define ZE_F_CRC_COMPARED 0x00000001 /* If 1, the CRC has been compared. */ +#define ZE_F_CRC_CORRECT 0x00000002 /* Only meaningful if ZE_F_CRC_COMPARED is 1 */ +#define ZE_F_VOLUME 0x00000004 /* Entry corresponds to //zipfs:/ */ unsigned char *data; /* File data if written */ struct ZipEntry *next; /* Next file in the same archive */ struct ZipEntry *tnext; /* Next top-level dir in archive */ @@ -1734,6 +1734,9 @@ ZipFSCatalogFilesystem( z->offset = zf->baseOffset; z->compressMethod = ZIP_COMPMETH_STORED; z->name = (char *) Tcl_GetHashKey(&ZipFS.fileHash, hPtr); + if (!strcmp(z->name, ZIPFS_VOLUME)) { + z->flags |= ZE_F_VOLUME; /* Mark as root volume */ + } z->next = zf->entries; zf->entries = z; } @@ -5253,7 +5256,9 @@ ZipFSMatchInDirectoryProc( || (!dirOnly && z->isDirectory))) { continue; } - if ((z->depth == scnt) && Tcl_StringCaseMatch(z->name, pat, 0)) { + if ((z->depth == scnt) && + ((z->flags & ZE_F_VOLUME) == 0) /* Bug 14db54d81e */ + && Tcl_StringCaseMatch(z->name, pat, 0)) { AppendWithPrefix(result, prefixBuf, z->name + strip, -1); } } |