diff options
author | vincentdarley <vincentdarley> | 2001-08-30 08:53:14 (GMT) |
---|---|---|
committer | vincentdarley <vincentdarley> | 2001-08-30 08:53:14 (GMT) |
commit | 209cbd9eea8f0938d87548bdea9bd8970d18a1fb (patch) | |
tree | cf952115d99a903d3c817b01278505ed6aaff55d /unix/tclLoadDld.c | |
parent | ea7d3c538d82fb64a201fedfb9376f6dcafbd102 (diff) | |
download | tcl-209cbd9eea8f0938d87548bdea9bd8970d18a1fb.zip tcl-209cbd9eea8f0938d87548bdea9bd8970d18a1fb.tar.gz tcl-209cbd9eea8f0938d87548bdea9bd8970d18a1fb.tar.bz2 |
filesystem
Diffstat (limited to 'unix/tclLoadDld.c')
-rw-r--r-- | unix/tclLoadDld.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/unix/tclLoadDld.c b/unix/tclLoadDld.c index 1f9e702..2b15148 100644 --- a/unix/tclLoadDld.c +++ b/unix/tclLoadDld.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclLoadDld.c,v 1.3 1999/04/16 00:48:04 stanton Exp $ + * RCS: @(#) $Id: tclLoadDld.c,v 1.4 2001/08/30 08:53:15 vincentdarley Exp $ */ #include "tclInt.h" @@ -49,9 +49,9 @@ */ int -TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) +TclpLoadFile(interp, pathPtr, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) Tcl_Interp *interp; /* Used for error reporting. */ - char *fileName; /* Name of the file containing the desired + Tcl_Obj *pathPtr; /* Name of the file containing the desired * code. */ char *sym1, *sym2; /* Names of two procedures to look up in * the file's symbol table. */ @@ -64,7 +64,8 @@ TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) { static int firstTime = 1; int returnCode; - + char *fileName = Tcl_GetString(pathPtr); + /* * The dld package needs to know the pathname to the tcl binary. * If that's not know, return an error. @@ -87,9 +88,10 @@ TclpLoadFile(interp, fileName, sym1, sym2, proc1Ptr, proc2Ptr, clientDataPtr) firstTime = 0; } - if ((returnCode = dld_link(fileName)) != 0) { - Tcl_AppendResult(interp, "couldn't load file \"", fileName, - "\": ", dld_strerror(returnCode), (char *) NULL); + if ((returnCode = dld_link(Tcl_GetString(pathPtr)) != 0) { + Tcl_AppendResult(interp, "couldn't load file \"", + Tcl_GetString(pathPtr), + "\": ", dld_strerror(returnCode), (char *) NULL); return TCL_ERROR; } *proc1Ptr = (Tcl_PackageInitProc *) dld_get_func(sym1); |