summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorhobbs <hobbs>2005-10-05 04:23:55 (GMT)
committerhobbs <hobbs>2005-10-05 04:23:55 (GMT)
commit25bf089e2d2828dbd9700ac450feed10b2848e56 (patch)
tree57e83616cdaf276ceac7e326c9499e1b30a75c17 /unix
parentb66bbd92b9d131723686e1ff389cc1932d60218e (diff)
downloadtcl-25bf089e2d2828dbd9700ac450feed10b2848e56.zip
tcl-25bf089e2d2828dbd9700ac450feed10b2848e56.tar.gz
tcl-25bf089e2d2828dbd9700ac450feed10b2848e56.tar.bz2
* unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second
shl_load only. [Bug 1204237]
Diffstat (limited to 'unix')
-rw-r--r--unix/tclLoadShl.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/tclLoadShl.c b/unix/tclLoadShl.c
index 60919a7..693e0fd 100644
--- a/unix/tclLoadShl.c
+++ b/unix/tclLoadShl.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadShl.c,v 1.13 2002/10/10 12:25:53 vincentdarley Exp $
+ * RCS: @(#) $Id: tclLoadShl.c,v 1.13.2.1 2005/10/05 04:23:56 hobbs Exp $
*/
#include <dl.h>
@@ -71,17 +71,16 @@ TclpDlopen(interp, pathPtr, loadHandle, unloadProcPtr)
*/
- /*
+ /*
* 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);
- handle = shl_load(native,
- BIND_DEFERRED|BIND_VERBOSE|DYNAMIC_PATH, 0L);
-
+ handle = shl_load(native, BIND_DEFERRED|BIND_VERBOSE, 0L);
+
if (handle == NULL) {
- /*
+ /*
* 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