Make calls early to find the script library in zipfs archive and alert

the Tcl library to its location so that all interps find it when created.
tcltk · Nov 13, 2023 · 4c391a1 · 4c391a1
1 parent 7bb4d60
commit 4c391a1
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
@@ -6453,6 +6453,7 @@ TclZipfs_AppHook(
 	    Tcl_DecrRefCount(vfsInitScript);
 	    if (found == TCL_OK) {
 		zipfs_literal_tcl_library = ZIPFS_TCL_LIBRARY_1;
+		Tcl_DecrRefCount(TclZipfs_TclLibrary());
 		return version;
 	    }
 	}
@@ -6479,7 +6480,7 @@ TclZipfs_AppHook(
 	     * wants it.
 	     */
 
-	    TclZipfs_TclLibrary();
+	    Tcl_DecrRefCount(TclZipfs_TclLibrary());
 	    TclNewLiteralStringObj(vfsInitScript,
 		    ZIPFS_TCL_LIBRARY_3 "install.tcl");
 	    Tcl_IncrRefCount(vfsInitScript);
@@ -6491,6 +6492,17 @@ TclZipfs_AppHook(
 	    int found;
 	    Tcl_Obj *vfsInitScript;
 
+	    /* Set Tcl Encodings */
+	    TclNewLiteralStringObj(vfsInitScript,
+		    ZIPFS_TCL_LIBRARY_1 "/init.tcl");
+	    Tcl_IncrRefCount(vfsInitScript);
+	    found = Tcl_FSAccess(vfsInitScript, F_OK);
+	    Tcl_DecrRefCount(vfsInitScript);
+	    if (found == TCL_OK) {
+		zipfs_literal_tcl_library = ZIPFS_TCL_LIBRARY_1;
+		Tcl_DecrRefCount(TclZipfs_TclLibrary());
+	    }
+
 	    TclNewLiteralStringObj(vfsInitScript, ZIPFS_APP_MOUNT "/main.tcl");
 	    Tcl_IncrRefCount(vfsInitScript);
 	    if (Tcl_FSAccess(vfsInitScript, F_OK) == 0) {
@@ -6502,14 +6514,8 @@ TclZipfs_AppHook(
 	    } else {
 		Tcl_DecrRefCount(vfsInitScript);
 	    }
-	    /* Set Tcl Encodings */
-	    TclNewLiteralStringObj(vfsInitScript,
-		    ZIPFS_TCL_LIBRARY_1 "/init.tcl");
-	    Tcl_IncrRefCount(vfsInitScript);
-	    found = Tcl_FSAccess(vfsInitScript, F_OK);
-	    Tcl_DecrRefCount(vfsInitScript);
+
 	    if (found == TCL_OK) {
-		zipfs_literal_tcl_library = ZIPFS_TCL_LIBRARY_1;
 		return version;
 	    }
 	}