d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the search directories from the hints file only the first time it is

Browse Source 
opened.  After that, the directories are already present, and there is
no point in adding them again.  This doesn't fix any bugs; it's just for
efficiency.
This commit is contained in:
jdp 1996-10-10 23:16:50 +00:00
parent 7a822140ad
commit 0297a4335c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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
* 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;
}

7
libexec/rtld-aout/rtld.c
View File

@ -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;
}