diff options
Diffstat (limited to 'generic/tclZipfs.c')
| -rw-r--r-- | generic/tclZipfs.c | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 42d36c4..9d3a3be 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -6259,15 +6259,25 @@ ZipfsAppHookFindTclInit( } #endif +/* + *------------------------------------------------------------------------ + * + * TclZipfsFinalize -- + * + * Frees all zipfs resources IRRESPECTIVE of open channels (there should + * not be any!) etc. To be called at process exit time (from + * Tcl_Finalize->TclFinalizeFilesystem) + * + * Results: + * None. + * + * Side effects: + * Frees up archives loaded into memory. + * + *------------------------------------------------------------------------ + */ void TclZipfsFinalize(void) { - /* - * Finalization steps: - * For every mounted archive, if it no longer has any open handles - * clean up the mount and associated zip file entries. - * If there are no more mounted archives, clean up and free the - * ZipFS.fileHash and ZipFS.zipHash tables. - */ WriteLock(); if (!ZipFS.initialized) { Unlock(); @@ -6279,30 +6289,21 @@ void TclZipfsFinalize(void) for (hPtr = Tcl_FirstHashEntry(&ZipFS.zipHash, &zipSearch); hPtr; hPtr = Tcl_NextHashEntry(&zipSearch)) { ZipFile *zf = (ZipFile *) Tcl_GetHashValue(hPtr); - if (zf->numOpen == 0) { - Tcl_DeleteHashEntry(hPtr); - CleanupMount(zf); - ZipFSCloseArchive(NULL, zf); - Tcl_Free(zf); - } + Tcl_DeleteHashEntry(hPtr); + CleanupMount(zf); /* Frees file entries belonging to the archive */ + ZipFSCloseArchive(NULL, zf); + Tcl_Free(zf); } - hPtr = Tcl_FirstHashEntry(&ZipFS.fileHash, &zipSearch); - if (hPtr == NULL) { - hPtr = Tcl_FirstHashEntry(&ZipFS.zipHash, &zipSearch); - if (hPtr == NULL) { - /* Both hash tables empty. Free all resources */ - Tcl_FSUnregister(&zipfsFilesystem); - Tcl_DeleteHashTable(&ZipFS.fileHash); - Tcl_DeleteHashTable(&ZipFS.zipHash); - if (ZipFS.fallbackEntryEncoding) { - Tcl_Free(ZipFS.fallbackEntryEncoding); - ZipFS.fallbackEntryEncoding = NULL; - } - ZipFS.initialized = 0; - } + Tcl_FSUnregister(&zipfsFilesystem); + Tcl_DeleteHashTable(&ZipFS.fileHash); + Tcl_DeleteHashTable(&ZipFS.zipHash); + if (ZipFS.fallbackEntryEncoding) { + Tcl_Free(ZipFS.fallbackEntryEncoding); + ZipFS.fallbackEntryEncoding = NULL; } + ZipFS.initialized = 0; Unlock(); } |