1 files changed, 83 insertions, 45 deletions

diff --git a/generic/tclStubLib.c b/generic/tclStubLib.c
index f06b2d1..31fc865 100644
--- a/generic/tclStubLib.c
+++ b/generic/tclStubLib.c
@@ -4,8 +4,8 @@
  *	Stub object that will be statically linked into extensions that want
  *	to access Tcl.
  *
- * Copyright © 1998-1999 Scriptics Corporation.
- * Copyright © 1998 Paul Duffin.
+ * Copyright (c) 1998-1999 by Scriptics Corporation.
+ * Copyright (c) 1998 Paul Duffin.
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -13,17 +13,11 @@
 
 #include "tclInt.h"
 
-MODULE_SCOPE const TclStubs *tclStubsPtr;
-MODULE_SCOPE const TclPlatStubs *tclPlatStubsPtr;
-MODULE_SCOPE const TclIntStubs *tclIntStubsPtr;
-MODULE_SCOPE const TclIntPlatStubs *tclIntPlatStubsPtr;
-MODULE_SCOPE void *tclStubsHandle;
-
-const TclStubs *tclStubsPtr = NULL;
-const TclPlatStubs *tclPlatStubsPtr = NULL;
-const TclIntStubs *tclIntStubsPtr = NULL;
-const TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
-void *tclStubsHandle = NULL;
+TclStubs *tclStubsPtr = NULL;
+TclPlatStubs *tclPlatStubsPtr = NULL;
+TclIntStubs *tclIntStubsPtr = NULL;
+TclIntPlatStubs *tclIntPlatStubsPtr = NULL;
+TclTomMathStubs* tclTomMathStubsPtr = NULL;
 
 /*
  * Use our own ISDIGIT to avoid linking to libc on windows
@@ -49,46 +43,42 @@ void *tclStubsHandle = NULL;
  *----------------------------------------------------------------------
  */
 #undef Tcl_InitStubs
-MODULE_SCOPE const char *
+CONST char *
 Tcl_InitStubs(
     Tcl_Interp *interp,
-    const char *version,
-    int exact,
-    int magic)
+    CONST char *version,
+    int exact)
 {
-    Interp *iPtr = (Interp *)interp;
-    const char *actualVersion = NULL;
-    void *pkgData = NULL;
-    const TclStubs *stubsPtr = iPtr->stubTable;
-    const char *tclName = (((exact&0xFF00) >= 0x900) ? "tcl" : "Tcl");
+    Interp *iPtr = (Interp *) interp;
+    CONST char *actualVersion = NULL;
+    ClientData pkgData = NULL;
+    TclStubs *stubsPtr = iPtr->stubTable;
 
-#undef TCL_STUB_MAGIC /* We need the TCL_STUB_MAGIC from Tcl 8.x here */
-#define TCL_STUB_MAGIC		((int) 0xFCA3BACF)
     /*
      * We can't optimize this check by caching tclStubsPtr because that
      * prevents apps from being able to load/unload Tcl dynamically multiple
      * times. [Bug 615304]
      */
 
-    if (!stubsPtr || (stubsPtr->magic != (((exact&0xFF00) >= 0x900) ? magic : TCL_STUB_MAGIC))) {
-	iPtr->result = (char *)"interpreter uses an incompatible stubs mechanism";
-	iPtr->freeProc = 0; /* TCL_STATIC */
+    if (!stubsPtr || (stubsPtr->magic != TCL_STUB_MAGIC)) {
+	iPtr->result = "interpreter uses an incompatible stubs mechanism";
+	iPtr->freeProc = TCL_STATIC;
 	return NULL;
     }
 
-    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, tclName, version, 0, &pkgData);
+    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 0, &pkgData);
     if (actualVersion == NULL) {
 	return NULL;
     }
-    if (exact&1) {
-	const char *p = version;
+    if (exact) {
+	CONST char *p = version;
 	int count = 0;
 
 	while (*p) {
 	    count += !ISDIGIT(*p++);
 	}
 	if (count == 1) {
-	    const char *q = actualVersion;
+	    CONST char *q = actualVersion;
 
 	    p = version;
 	    while (*p && (*p == *q)) {
@@ -96,29 +86,22 @@ Tcl_InitStubs(
 	    }
 	    if (*p || ISDIGIT(*q)) {
 		/* Construct error message */
-		stubsPtr->tcl_PkgRequireEx(interp, tclName, version, 1, NULL);
+		stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
 		return NULL;
 	    }
 	} else {
-	    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, tclName, version, 1, NULL);
+	    actualVersion = stubsPtr->tcl_PkgRequireEx(interp, "Tcl", version, 1, NULL);
 	    if (actualVersion == NULL) {
 		return NULL;
 	    }
 	}
     }
-    if (((exact&0xFF00) < 0x900)) {
-	/* We are running Tcl 8.x */
-	stubsPtr = (TclStubs *)pkgData;
-    }
-    if (tclStubsHandle == NULL) {
-	tclStubsHandle = INT2PTR(-1);
-    }
-    tclStubsPtr = stubsPtr;
+    tclStubsPtr = (TclStubs *)pkgData;
 
-    if (stubsPtr->hooks) {
-	tclPlatStubsPtr = stubsPtr->hooks->tclPlatStubs;
-	tclIntStubsPtr = stubsPtr->hooks->tclIntStubs;
-	tclIntPlatStubsPtr = stubsPtr->hooks->tclIntPlatStubs;
+    if (tclStubsPtr->hooks) {
+	tclPlatStubsPtr = tclStubsPtr->hooks->tclPlatStubs;
+	tclIntStubsPtr = tclStubsPtr->hooks->tclIntStubs;
+	tclIntPlatStubsPtr = tclStubsPtr->hooks->tclIntPlatStubs;
     } else {
 	tclPlatStubsPtr = NULL;
 	tclIntStubsPtr = NULL;
@@ -129,6 +112,61 @@ Tcl_InitStubs(
 }
 
 /*
+ *----------------------------------------------------------------------
+ *
+ * TclTomMathInitStubs --
+ *
+ *	Initializes the Stubs table for Tcl's subset of libtommath
+ *
+ * Results:
+ *	Returns a standard Tcl result.
+ *
+ * This procedure should not be called directly, but rather through
+ * the TclTomMath_InitStubs macro, to insure that the Stubs table
+ * matches the header files used in compilation.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#undef TclTomMathInitializeStubs
+
+CONST char*
+TclTomMathInitializeStubs(
+    Tcl_Interp* interp,		/* Tcl interpreter */
+    CONST char* version,	/* Tcl version needed */
+    int epoch,			/* Stubs table epoch from the header files */
+    int revision		/* Stubs table revision number from the
+				 * header files */
+) {
+    int exact = 0;
+    const char* packageName = "tcl::tommath";
+    const char* errMsg = NULL;
+    ClientData pkgClientData = NULL;
+    const char* actualVersion = 
+	tclStubsPtr->tcl_PkgRequireEx(interp, packageName, version, exact, &pkgClientData);
+    TclTomMathStubs* stubsPtr = (TclTomMathStubs*) pkgClientData;
+    if (actualVersion == NULL) {
+	return NULL;
+    }
+    if (pkgClientData == NULL) {
+	errMsg = "missing stub table pointer";
+    } else if ((stubsPtr->tclBN_epoch)() != epoch) {
+	errMsg = "epoch number mismatch";
+    } else if ((stubsPtr->tclBN_revision)() != revision) {
+	errMsg = "requires a later revision";
+    } else {
+	tclTomMathStubsPtr = stubsPtr;
+	return actualVersion;
+    }
+    tclStubsPtr->tcl_ResetResult(interp);
+    tclStubsPtr->tcl_AppendResult(interp, "error loading ", packageName,
+		     " (requested version ", version,
+		     ", actual version ", actualVersion,
+		     "): ", errMsg, NULL);
+    return NULL;
+}
+
+/*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4