* README:

	* generic/tcl.h:
	* tools/tcl.wse.in:
	* unix/configure.in:
	* unix/tcl.spec:
	* win/configure.in:
	* win/README.binary: bumped version to 8.3.1

	* win/tcl.hpj.in: updated copyright date

	* generic/tclEnv.c: environment support for Mac OS/X
	* unix/tclUnixPort.h: environment support for Mac OS/X
	* unix/tclLoadDyld.c: new file for Mac OS/X dl functions
	* unix/Makefile.in: added install-strip target; bindir, libdir,
	mandir, includedir vars; tclLoadDyld.c target [Bug: 2527]

	* unix/tclUnixChan.c (CreateSocket): force a socket back into
	blocking mode (default state) after a -async connect succeeds.
	[Bug: 4388]

	* generic/tclEvent.c (TclInitSubsystems): Moved tclLibraryPath to
	thread-local storage to prevent thread-related race condition.
	[Bug: 5033]
	* unix/tclAppInit.c (main): removed #ifdef TCL_TEST that sets the
	library path as it was unnecessary and conflicts with move of
	tclLibraryPath to thread-local storage.

1 files changed, 168 insertions, 0 deletions

diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
new file mode 100644
index 0000000..6b17ba9
--- /dev/null
+++ b/unix/tclLoadDyld.c
@@ -0,0 +1,168 @@
+/* 
+ * tclLoadDyld.c --
+ *
+ *     This procedure provides a version of the TclLoadFile that
+ *     works with NeXT/Apple's dyld dynamic loading.  This file
+ *     provided by Wilfredo Sanchez (wsanchez@apple.com).
+ *     The works on Mac OS X and Mac OS X Server.
+ *     It should work with OpenStep, but it's not been tried.
+ *
+ * Copyright (c) 1995 Apple Computer, Inc.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.1 2000/04/19 08:32:45 hobbs Exp $
+ */
+
+#include "tclInt.h"
+#include <mach-o/dyld.h>
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclpLoadFile --
+ *
+ *     Dynamically loads a binary code file into memory and returns
+ *     the addresses of two procedures within that file, if they
+ *     are defined.
+ *
+ * Results:
+ *     A standard Tcl completion code.  If an error occurs, an error
+ *     message is left in interp->result.  *proc1Ptr and *proc2Ptr
+ *     are filled in with the addresses of the symbols given by
+ *     *sym1 and *sym2, or NULL if those symbols can't be found.
+ *
+ * Side effects:
+ *     New code suddenly appears in memory.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr)
+    Tcl_Interp *interp;		/* Used for error reporting. */
+    char *fileName;		/* Name of the file containing the desired
+				 * code. */
+    char *sym1, *sym2;		/* Names of two procedures to look up in
+				 * the file's symbol table. */
+    Tcl_PackageInitProc **proc1Ptr, **proc2Ptr;
+				/* Where to return the addresses corresponding
+				 * to sym1 and sym2. */
+    ClientData *clientDataPtr;	/* Filled with token for dynamically loaded
+				 * file which will be passed back to 
+				 * TclpUnloadFile() to unload the file. */
+{
+    NSObjectFileImageReturnCode	err;
+    NSObjectFileImage		image;
+    NSModule			module;
+    NSSymbol			symbol;
+    char			*name;
+
+    err = NSCreateObjectFileImageFromFile(fileName, &image);
+    if (err != NSObjectFileImageSuccess) {
+	switch (err) {
+	    case NSObjectFileImageFailure:
+		interp->result = "dyld: general failure";
+		break;
+	    case NSObjectFileImageInappropriateFile:
+		interp->result = "dyld: inappropriate Mach-O file";
+		break;
+	    case NSObjectFileImageArch:
+		interp->result = "dyld: inappropriate Mach-O architecture";
+		break;
+	    case NSObjectFileImageFormat:
+		interp->result = "dyld: invalid Mach-O file format";
+		break;
+	    case NSObjectFileImageAccess:
+		interp->result = "dyld: permission denied";
+		break;
+	    default:
+		interp->result = "dyld: unknown failure";
+		break;
+	}
+	return TCL_ERROR;
+    }
+
+    module = NSLinkModule(image, fileName, TRUE);
+
+    if (module == NULL) {
+	interp->result = "dyld: falied to link module";
+	return TCL_ERROR;
+    }
+
+    name = (char*)malloc(sizeof(char)*(strlen(sym1)+2));
+    sprintf(name, "_%s", sym1);
+    symbol = NSLookupAndBindSymbol(name);
+    free(name);
+    *proc1Ptr = NSAddressOfSymbol(symbol);
+
+    name = (char*)malloc(sizeof(char)*(strlen(sym2)+2));
+    sprintf(name, "_%s", sym2);
+    symbol = NSLookupAndBindSymbol(name);
+    free(name);
+    *proc2Ptr = NSAddressOfSymbol(symbol);
+
+    *clientDataPtr = module;
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclpUnloadFile --
+ *
+ *     Unloads a dynamically loaded binary code file from memory.
+ *     Code pointers in the formerly loaded file are no longer valid
+ *     after calling this function.
+ *
+ * Results:
+ *     None.
+ *
+ * Side effects:
+ *     Code dissapears from memory.
+ *     Note that this is a no-op on older (OpenStep) versions of dyld.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TclpUnloadFile(clientData)
+    ClientData clientData;	/* ClientData returned by a previous call
+				 * to TclpLoadFile().  The clientData is 
+				 * a token that represents the loaded 
+				 * file. */
+{
+    NSUnLinkModule(clientData, FALSE);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TclGuessPackageName --
+ *
+ *     If the "load" command is invoked without providing a package
+ *     name, this procedure is invoked to try to figure it out.
+ *
+ * Results:
+ *     Always returns 0 to indicate that we couldn't figure out a
+ *     package name;  generic code will then try to guess the package
+ *     from the file name.  A return value of 1 would have meant that
+ *     we figured out the package name and put it in bufPtr.
+ *
+ * Side effects:
+ *     None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TclGuessPackageName(fileName, bufPtr)
+    char *fileName;	       /* Name of file containing package (already
+				* translated to local form if needed). */
+    Tcl_DString *bufPtr;       /* Initialized empty dstring.  Append
+				* package name to this if possible. */
+{
+    return 0;
+}