Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Libraries which are in the hints file but not in one's LD_LIBRARY_PATH (if

Browse Source 
set) were not found.
This commit is contained in:
pk 1994-02-15 22:51:23 +00:00
parent bc47f533d5
commit 1bb4f06e2a
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/usr.bin/ld/rtld/rtld.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: rtld.c,v 1.14 1994/01/29 02:03:39 jtc Exp $ * $Id: rtld.c,v 1.15 1994/02/15 22:51:23 pk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -1073,13 +1073,17 @@ rtfindlib(name, major, minor, usehints)
if (hint) if (hint)
return hint; return hint;
} }
} else { /* Not found in hints, try directory search */
/* No LD_LIBRARY_PATH, check default */ hint = (char *)findshlib(name, &major, &minor, 0);
hint = findhint(name, major, minor, NULL);
if (hint) if (hint)
return hint; return hint;
} }
/* No LD_LIBRARY_PATH or lib not found in there; check default */
hint = findhint(name, major, minor, NULL);
if (hint)
return hint;
/* No hints available for name */ /* No hints available for name */
*usehints = 0; *usehints = 0;
return (char *)findshlib(name, &major, &minor, 0); return (char *)findshlib(name, &major, &minor, 0);

12
libexec/ld.aout_so/rtld.c
View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: rtld.c,v 1.14 1994/01/29 02:03:39 jtc Exp $ * $Id: rtld.c,v 1.15 1994/02/15 22:51:23 pk Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -1073,13 +1073,17 @@ rtfindlib(name, major, minor, usehints)
if (hint) if (hint)
return hint; return hint;
} }
} else { /* Not found in hints, try directory search */
/* No LD_LIBRARY_PATH, check default */ hint = (char *)findshlib(name, &major, &minor, 0);
hint = findhint(name, major, minor, NULL);
if (hint) if (hint)
return hint; return hint;
} }
/* No LD_LIBRARY_PATH or lib not found in there; check default */
hint = findhint(name, major, minor, NULL);
if (hint)
return hint;
/* No hints available for name */ /* No hints available for name */
*usehints = 0; *usehints = 0;
return (char *)findshlib(name, &major, &minor, 0); return (char *)findshlib(name, &major, &minor, 0);