From 25bf089e2d2828dbd9700ac450feed10b2848e56 Mon Sep 17 00:00:00 2001 From: hobbs Date: Wed, 5 Oct 2005 04:23:55 +0000 Subject: * unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second shl_load only. [Bug 1204237] --- ChangeLog | 5 +++++ unix/tclLoadShl.c | 11 +++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index e57b082..6e4cd96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-10-04 Jeff Hobbs + + * unix/tclLoadShl.c (TclpDlopen): use DYNAMIC_PATH on second + shl_load only. [Bug 1204237] + 2005-10-04 Zoran Vasiljevic * generic/tclIO.c (Tcl_ClearChannelHandlers): now deletes any 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 @@ -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 -- cgit v0.12