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

Very minor cleanup of the previous.

This commit is contained in:
mycroft 2002-09-24 00:02:46 +00:00
parent 86103e2f0e
commit f1184d192e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libexec/ld.elf_so/search.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: search.c,v 1.11 2002/09/23 23:56:49 mycroft Exp $ */ /* $NetBSD: search.c,v 1.12 2002/09/24 00:02:46 mycroft Exp $ */
/* /*
* Copyright 1996 Matt Thomas <matt@3am-software.com> * Copyright 1996 Matt Thomas <matt@3am-software.com>
@ -119,11 +119,11 @@ _rtld_load_library(name, refobj, mode)
(void)strcpy(pathname, LIBDIR); (void)strcpy(pathname, LIBDIR);
(void)strcpy(pathname + LIBDIRLEN, name + (void)strcpy(pathname + LIBDIRLEN, name +
SVR4_LIBDIRLEN); SVR4_LIBDIRLEN);
goto found2; goto found;
} }
#endif /* SVR4_LIBDIR */ #endif /* SVR4_LIBDIR */
pathname = xstrdup(name); pathname = xstrdup(name);
goto found2; goto found;
} }
dbg((" Searching for \"%s\" (%p)", name, refobj)); dbg((" Searching for \"%s\" (%p)", name, refobj));
@ -132,26 +132,25 @@ _rtld_load_library(name, refobj, mode)
for (sp = _rtld_paths; sp != NULL; sp = sp->sp_next) for (sp = _rtld_paths; sp != NULL; sp = sp->sp_next)
if ((obj = _rtld_search_library_path(name, namelen, if ((obj = _rtld_search_library_path(name, namelen,
sp->sp_path, sp->sp_pathlen, mode)) != NULL) sp->sp_path, sp->sp_pathlen, mode)) != NULL)
goto found; return obj;
if (refobj != NULL) if (refobj != NULL)
for (sp = refobj->rpaths; sp != NULL; sp = sp->sp_next) for (sp = refobj->rpaths; sp != NULL; sp = sp->sp_next)
if ((obj = _rtld_search_library_path(name, if ((obj = _rtld_search_library_path(name,
namelen, sp->sp_path, sp->sp_pathlen, mode)) != NULL) namelen, sp->sp_path, sp->sp_pathlen, mode)) != NULL)
goto found; return obj;
for (sp = _rtld_default_paths; sp != NULL; sp = sp->sp_next) for (sp = _rtld_default_paths; sp != NULL; sp = sp->sp_next)
if ((obj = _rtld_search_library_path(name, namelen, if ((obj = _rtld_search_library_path(name, namelen,
sp->sp_path, sp->sp_pathlen, mode)) != NULL) sp->sp_path, sp->sp_pathlen, mode)) != NULL)
goto found; return obj;
_rtld_error("Shared object \"%s\" not found", name); _rtld_error("Shared object \"%s\" not found", name);
return NULL; return NULL;
found2: found:
obj = _rtld_load_object(pathname, mode); obj = _rtld_load_object(pathname, mode);
if (obj == NULL) if (obj == NULL)
free(pathname); free(pathname);
found:
return obj; return obj;
} }