From 1952bac5479aeb7c7493591cd707ed9ed8ba6b54 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 5 Jan 2017 15:13:58 +0000
Subject: Make TclGetLoadedPackagesEx() work with other than the only current
 interpreter (didn't really think about that earlier ... ). Actually slightly
 more correct.

---
 generic/tclLoad.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/generic/tclLoad.c b/generic/tclLoad.c
index 44085d6..bcda420 100644
--- a/generic/tclLoad.c
+++ b/generic/tclLoad.c
@@ -1074,20 +1074,27 @@ TclGetLoadedPackagesEx(
 	return TCL_OK;
     }
 
+    target = Tcl_GetSlave(interp, targetName);
+    if (target == NULL) {
+	return TCL_ERROR;
+    }
+    ipPtr = Tcl_GetAssocData(target, "tclLoad", NULL);
+
     /*
      * Return information about all of the available packages.
      */
     if (packageName) {
 	resultObj = NULL;
-	Tcl_MutexLock(&packageMutex);
-	for (pkgPtr = firstPackagePtr; pkgPtr != NULL;
-		pkgPtr = pkgPtr->nextPtr) {
+
+	for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
+	    pkgPtr = ipPtr->pkgPtr;
+
 	    if (!strcmp(packageName, pkgPtr->packageName)) {
 		resultObj = Tcl_NewStringObj(pkgPtr->fileName, -1);
 		break;
 	    }
 	}
-	Tcl_MutexUnlock(&packageMutex);
+
 	if (resultObj) {
 	    Tcl_SetObjResult(interp, resultObj);
 	}
@@ -1099,11 +1106,6 @@ TclGetLoadedPackagesEx(
      * interpreter.
      */
 
-    target = Tcl_GetSlave(interp, targetName);
-    if (target == NULL) {
-	return TCL_ERROR;
-    }
-    ipPtr = Tcl_GetAssocData(target, "tclLoad", NULL);
     resultObj = Tcl_NewObj();
     for (; ipPtr != NULL; ipPtr = ipPtr->nextPtr) {
 	pkgPtr = ipPtr->pkgPtr;
-- 
cgit v0.12