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

Relax checking of minor version number in `findhint()'. Also use the

Browse Source 
directories from the hints (v.2) file for directory traversing.
This should take care of PR#1146.
This commit is contained in:
pk 1996-01-14 00:35:17 +00:00
parent cca25e85ec
commit 55d51fbb95
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/* $NetBSD: rtld.c,v 1.42 1996/01/09 00:02:28 pk Exp $ */ /* $NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $ */
/* /*
* Copyright (c) 1993 Paul Kranenburg * Copyright (c) 1993 Paul Kranenburg
* All rights reserved. * All rights reserved.
@ -1086,6 +1086,7 @@ static long hsize;
static struct hints_header *hheader; static struct hints_header *hheader;
static struct hints_bucket *hbuckets; static struct hints_bucket *hbuckets;
static char *hstrtab; static char *hstrtab;
static char *hint_search_path = "";
#define HINTS_VALID (hheader != NULL && hheader != (struct hints_header *)-1) #define HINTS_VALID (hheader != NULL && hheader != (struct hints_header *)-1)
@ -1138,6 +1139,8 @@ maphints()
hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab); hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab);
hstrtab = (char *)(addr + hheader->hh_strtab); hstrtab = (char *)(addr + hheader->hh_strtab);
if (hheader->hh_version >= LD_HINTS_VERSION_2)
hint_search_path = hstrtab + hheader->hh_dirlist;
} }
static void static void
@ -1195,7 +1198,7 @@ findhint(name, major, minor, prefered_path)
if (strcmp(name, hstrtab + bp->hi_namex) == 0) { if (strcmp(name, hstrtab + bp->hi_namex) == 0) {
/* It's `name', check version numbers */ /* It's `name', check version numbers */
if (bp->hi_major == major && if (bp->hi_major == major &&
(bp->hi_ndewey < 2 || bp->hi_minor == minor)) { (bp->hi_ndewey < 2 || bp->hi_minor >= minor)) {
if (prefered_path == NULL || if (prefered_path == NULL ||
strncmp(prefered_path, strncmp(prefered_path,
hstrtab + bp->hi_pathx, hstrtab + bp->hi_pathx,
@ -1272,7 +1275,9 @@ lose:
/* No hints available for name */ /* No hints available for name */
*usehints = 0; *usehints = 0;
realminor = -1; realminor = -1;
add_search_path(hint_search_path);
cp = (char *)findshlib(name, &major, &realminor, 0); cp = (char *)findshlib(name, &major, &realminor, 0);
remove_search_path(hint_search_path);
if (cp) { if (cp) {
if (realminor < minor && !ld_suppress_warnings) if (realminor < minor && !ld_suppress_warnings)
warnx("warning: lib%s.so.%d.%d: " warnx("warning: lib%s.so.%d.%d: "

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

@ -1,4 +1,4 @@
/* $NetBSD: rtld.c,v 1.42 1996/01/09 00:02:28 pk Exp $ */ /* $NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $ */
/* /*
* Copyright (c) 1993 Paul Kranenburg * Copyright (c) 1993 Paul Kranenburg
* All rights reserved. * All rights reserved.
@ -1086,6 +1086,7 @@ static long hsize;
static struct hints_header *hheader; static struct hints_header *hheader;
static struct hints_bucket *hbuckets; static struct hints_bucket *hbuckets;
static char *hstrtab; static char *hstrtab;
static char *hint_search_path = "";
#define HINTS_VALID (hheader != NULL && hheader != (struct hints_header *)-1) #define HINTS_VALID (hheader != NULL && hheader != (struct hints_header *)-1)
@ -1138,6 +1139,8 @@ maphints()
hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab); hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab);
hstrtab = (char *)(addr + hheader->hh_strtab); hstrtab = (char *)(addr + hheader->hh_strtab);
if (hheader->hh_version >= LD_HINTS_VERSION_2)
hint_search_path = hstrtab + hheader->hh_dirlist;
} }
static void static void
@ -1195,7 +1198,7 @@ findhint(name, major, minor, prefered_path)
if (strcmp(name, hstrtab + bp->hi_namex) == 0) { if (strcmp(name, hstrtab + bp->hi_namex) == 0) {
/* It's `name', check version numbers */ /* It's `name', check version numbers */
if (bp->hi_major == major && if (bp->hi_major == major &&
(bp->hi_ndewey < 2 || bp->hi_minor == minor)) { (bp->hi_ndewey < 2 || bp->hi_minor >= minor)) {
if (prefered_path == NULL || if (prefered_path == NULL ||
strncmp(prefered_path, strncmp(prefered_path,
hstrtab + bp->hi_pathx, hstrtab + bp->hi_pathx,
@ -1272,7 +1275,9 @@ lose:
/* No hints available for name */ /* No hints available for name */
*usehints = 0; *usehints = 0;
realminor = -1; realminor = -1;
add_search_path(hint_search_path);
cp = (char *)findshlib(name, &major, &realminor, 0); cp = (char *)findshlib(name, &major, &realminor, 0);
remove_search_path(hint_search_path);
if (cp) { if (cp) {
if (realminor < minor && !ld_suppress_warnings) if (realminor < minor && !ld_suppress_warnings)
warnx("warning: lib%s.so.%d.%d: " warnx("warning: lib%s.so.%d.%d: "