summaryrefslogtreecommitdiffstats
path: root/unix/tclLoadNext.c
diff options
context:
space:
mode:
Diffstat (limited to 'unix/tclLoadNext.c')
-rw-r--r--unix/tclLoadNext.c148
1 files changed, 67 insertions, 81 deletions
diff --git a/unix/tclLoadNext.c b/unix/tclLoadNext.c
index 3de3cf1..7ba5eff 100644
--- a/unix/tclLoadNext.c
+++ b/unix/tclLoadNext.c
@@ -1,13 +1,14 @@
-/*
+/*
* tclLoadNext.c --
*
- * This procedure provides a version of the TclLoadFile that works with
- * NeXTs rld_* dynamic loading. This file provided by Pedja Bogdanovich.
+ * This procedure provides a version of the TclLoadFile that
+ * works with NeXTs rld_* dynamic loading. This file provided
+ * by Pedja Bogdanovich.
*
* Copyright (c) 1995-1997 Sun Microsystems, Inc.
*
- * See the file "license.terms" for information on usage and redistribution of
- * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*/
#include "tclInt.h"
@@ -19,12 +20,12 @@
*
* TclpDlopen --
*
- * Dynamically loads a binary code file into memory and returns a handle
- * to the new code.
+ * Dynamically loads a binary code file into memory and returns
+ * a handle to the new code.
*
* Results:
- * A standard Tcl completion code. If an error occurs, an error message
- * is left in the interp's result.
+ * A standard Tcl completion code. If an error occurs, an error
+ * message is left in the interp's result.
*
* Side effects:
* New code suddenly appears in memory.
@@ -33,69 +34,65 @@
*/
int
-TclpDlopen(
- Tcl_Interp *interp, /* Used for error reporting. */
- Tcl_Obj *pathPtr, /* Name of the file containing the desired
+TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
+ Tcl_Interp *interp; /* Used for error reporting. */
+ Tcl_Obj *pathPtr; /* Name of the file containing the desired
* code (UTF-8). */
- Tcl_LoadHandle *loadHandle, /* Filled with token for dynamically loaded
- * file which will be passed back to
+ Tcl_LoadHandle *loadHandle; /* Filled with token for dynamically loaded
+ * file which will be passed back to
* (*unloadProcPtr)() to unload the file. */
- Tcl_FSUnloadFileProc **unloadProcPtr)
+ Tcl_FSUnloadFileProc **unloadProcPtr;
/* Filled with address of Tcl_FSUnloadFileProc
- * function which should be used for this
- * file. */
+ * function which should be used for
+ * this file. */
{
struct mach_header *header;
char *fileName;
char *files[2];
CONST char *native;
int result = 1;
-
+
NXStream *errorStream = NXOpenMemory(0,0,NX_READWRITE);
-
+
fileName = Tcl_GetString(pathPtr);
- /*
- * First try the full path the user gave us. This is particularly
- * important if the cwd is inside a vfs, and we are trying to load using a
- * relative path.
+ /*
+ * First try the full path the user gave us. This is particularly
+ * important if the cwd is inside a vfs, and we are trying to load
+ * using a relative path.
*/
-
native = Tcl_FSGetNativePath(pathPtr);
files = {native,NULL};
result = rld_load(errorStream, &header, files, NULL);
-
+
if (!result) {
- /*
- * Let the OS loader examine the binary search path for whatever
- * string the user gave us which hopefully refers to a file on the
- * binary path
+ /*
+ * Let the OS loader examine the binary search path for
+ * whatever string the user gave us which hopefully refers
+ * to a file on the binary path
*/
-
Tcl_DString ds;
-
native = Tcl_UtfToExternalDString(NULL, fileName, -1, &ds);
files = {native,NULL};
result = rld_load(errorStream, &header, files, NULL);
Tcl_DStringFree(&ds);
}
-
+
if (!result) {
char *data;
int len, maxlen;
-
NXGetMemoryBuffer(errorStream,&data,&len,&maxlen);
- Tcl_AppendResult(interp, "couldn't load file \"", fileName, "\": ",
- data, NULL);
+ Tcl_AppendResult(interp, "couldn't load file \"",
+ fileName, "\": ", data, NULL);
NXCloseMemory(errorStream, NX_FREEBUFFER);
return TCL_ERROR;
}
NXCloseMemory(errorStream, NX_FREEBUFFER);
-
+
*loadHandle = (Tcl_LoadHandle)1; /* A dummy non-NULL value */
*unloadProcPtr = &TclpUnloadFile;
-
+
return TCL_OK;
}
@@ -104,31 +101,27 @@ TclpDlopen(
*
* TclpFindSymbol --
*
- * Looks up a symbol, by name, through a handle associated with a
- * previously loaded piece of code (shared library).
+ * Looks up a symbol, by name, through a handle associated with
+ * a previously loaded piece of code (shared library).
*
* Results:
- * Returns a pointer to the function associated with 'symbol' if it is
- * found. Otherwise returns NULL and may leave an error message in the
- * interp's result.
+ * Returns a pointer to the function associated with 'symbol' if
+ * it is found. Otherwise returns NULL and may leave an error
+ * message in the interp's result.
*
*----------------------------------------------------------------------
*/
-
-Tcl_PackageInitProc *
-TclpFindSymbol(
- Tcl_Interp *interp,
- Tcl_LoadHandle loadHandle,
- CONST char *symbol)
+Tcl_PackageInitProc*
+TclpFindSymbol(interp, loadHandle, symbol)
+ Tcl_Interp *interp;
+ Tcl_LoadHandle loadHandle;
+ CONST char *symbol;
{
- Tcl_PackageInitProc *proc = NULL;
- if (symbol) {
- char sym[strlen(symbol) + 2];
-
- sym[0] = '_';
- sym[1] = 0;
- strcat(sym, symbol);
- rld_lookup(NULL, sym, (unsigned long *)&proc);
+ Tcl_PackageInitProc *proc=NULL;
+ if(symbol) {
+ char sym[strlen(symbol)+2];
+ sym[0]='_'; sym[1]=0; strcat(sym,symbol);
+ rld_lookup(NULL,sym,(unsigned long *)&proc);
}
return proc;
}
@@ -138,9 +131,9 @@ TclpFindSymbol(
*
* 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.
+ * 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.
@@ -152,10 +145,11 @@ TclpFindSymbol(
*/
void
-TclpUnloadFile(
- Tcl_LoadHandle loadHandle) /* loadHandle returned by a previous call to
- * TclpDlopen(). The loadHandle is a token
- * that represents the loaded file. */
+TclpUnloadFile(loadHandle)
+ Tcl_LoadHandle loadHandle; /* loadHandle returned by a previous call
+ * to TclpDlopen(). The loadHandle is
+ * a token that represents the loaded
+ * file. */
{
}
@@ -164,14 +158,14 @@ TclpUnloadFile(
*
* TclGuessPackageName --
*
- * If the "load" command is invoked without providing a package name,
- * this procedure is invoked to try to figure it out.
+ * 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.
+ * 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.
@@ -180,19 +174,11 @@ TclpUnloadFile(
*/
int
-TclGuessPackageName(
- CONST char *fileName, /* Name of file containing package (already
+TclGuessPackageName(fileName, bufPtr)
+ CONST 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. */
+ Tcl_DString *bufPtr; /* Initialized empty dstring. Append
+ * package name to this if possible. */
{
return 0;
}
-
-/*
- * Local Variables:
- * mode: c
- * c-basic-offset: 4
- * fill-column: 78
- * End:
- */