From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 5 Aug 2007 11:06:14 +0000 (+0000)
Subject: * libltdl/ltdl.c (try_dlopen): Use `attempt' rather than
X-Git-Tag: release-2-1b~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e54f75846da13032555e9bcd4f497f806a9091b;p=thirdparty%2Flibtool.git

* libltdl/ltdl.c (try_dlopen): Use `attempt' rather than
`filename', as the former has the needed extension when called
by lt_dlopenext.
Report by Brian Barrett.
---

diff --git a/ChangeLog b/ChangeLog
index 4f21bb15a..cf09b1712 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/ltdl.c (try_dlopen): Use `attempt' rather than
+	`filename', as the former has the needed extension when called
+	by lt_dlopenext.
+	Report by Brian Barrett.
+
 2007-07-27  Peter Rosin  <peda@lysator.liu.se>
 
 	* Makefile.am: Pass STRIP through to the testsuite, so that
diff --git a/libltdl/ltdl.c b/libltdl/ltdl.c
index a3cf6e3c7..41e9f0799 100644
--- a/libltdl/ltdl.c
+++ b/libltdl/ltdl.c
@@ -1255,7 +1255,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
 	    }
 	  newhandle = *phandle;
 
-	  if (tryall_dlopen (&newhandle, filename, advise, vtable) == 0)
+	  if (tryall_dlopen (&newhandle, attempt, advise, vtable) == 0)
 	    {
 	      goto register_handle;
 	    }
@@ -1317,7 +1317,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
 	}
       if (!file)
 	{
-	  file = fopen (filename, LT_READTEXT_MODE);
+	  file = fopen (attempt, LT_READTEXT_MODE);
 	}
 
       /* If we didn't find the file by now, it really isn't there.  Set
@@ -1415,7 +1415,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
 #endif
 		   )))
 	{
-	  if (tryall_dlopen (&newhandle, filename, advise, 0) != 0)
+	  if (tryall_dlopen (&newhandle, attempt, advise, 0) != 0)
 	    {
 	      newhandle = NULL;
 	    }