diff options
| author | John Polstra <jdp@FreeBSD.org> | 1996-10-10 23:16:50 +0000 |
|---|---|---|
| committer | John Polstra <jdp@FreeBSD.org> | 1996-10-10 23:16:50 +0000 |
| commit | e5bbb2e4b5520a16947e4535a4c29cd4a3139882 (patch) | |
| tree | 07ddb243f6ede43973cd5b9059a7018f597dfb45 /gnu/usr.bin/ld | |
| parent | 7c6da7dcef3fd51862f3a87d2c7a041ddf21dca4 (diff) | |
Notes
Diffstat (limited to 'gnu/usr.bin/ld')
| -rw-r--r-- | gnu/usr.bin/ld/rtld/rtld.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index fc1024b1f5f0..f470c5ebc105 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: rtld.c,v 1.37 1996/10/01 16:09:18 nate Exp $ + * $Id: rtld.c,v 1.38 1996/10/10 04:10:32 jdp Exp $ */ #include <sys/param.h> @@ -1575,6 +1575,7 @@ static char *hstrtab; maphints __P((void)) { static int hints_bad; /* TRUE if hints are unusable */ + static int paths_added; int hfd; struct hints_header hdr; caddr_t addr; @@ -1616,8 +1617,10 @@ maphints __P((void)) hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab); hstrtab = (char *)(addr + hheader->hh_strtab); /* pluck out the system ldconfig path */ - if (hheader->hh_version >= LD_HINTS_VERSION_2) + if (hheader->hh_version >= LD_HINTS_VERSION_2 && !paths_added) { add_search_path(hstrtab + hheader->hh_dirlist); + paths_added = 1; + } return 0; } |