i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unlike the ELF specs, BeOS ignores the path of shared objects specified by the DT_NEEDED

Browse Source 
element. We now soften the rule that the absolute path should be used, and give libraries
another chance and search them in the standard search paths. This fixes bug #601 and lets
Becasso run on Haiku.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17669 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2006-05-31 15:59:42 +00:00
parent 3b5cc3b1f3
commit 3728e62e88
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/runtime_loader/Jamfile
+1 -1
View File
@@ -8,7 +8,7 @@ UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
SubDirCcFlags -fno-builtin ; SubDirCcFlags -fno-builtin ;
SubDirC++Flags -fno-builtin -fno-exceptions ; SubDirC++Flags -fno-builtin -fno-exceptions ;
# needed for rld.so only # needed for "runtime_loader" only
StaticLibrary libruntime_loader.a : StaticLibrary libruntime_loader.a :
kernel_vsprintf.c kernel_vsprintf.c
: :
src/system/runtime_loader/runtime_loader.c
+21 -5
View File
@@ -18,6 +18,14 @@
#include <sys/stat.h> #include <sys/stat.h>
//#define TRACE_RLD
#ifdef TRACE_RLD
# define TRACE(x) printf x
#else
# define TRACE(x) ;
#endif
struct uspace_program_args *gProgramArgs; struct uspace_program_args *gProgramArgs;
@@ -114,7 +122,7 @@ try_open_executable(const char *dir, int dirLen, const char *name, char *path,
strcpy(path + dirLen + 1, name); strcpy(path + dirLen + 1, name);
} }
//TRACE(("rld.so: try_open_container(): %s\n", path)); TRACE(("runtime_loader: try_open_container(): %s\n", path));
return _kern_open(-1, path, O_RDONLY, 0); return _kern_open(-1, path, O_RDONLY, 0);
} }
@@ -127,8 +135,8 @@ search_executable_in_path_list(const char *name, const char *pathList,
const char *pathListEnd = pathList + pathListLen; const char *pathListEnd = pathList + pathListLen;
status_t status = B_ENTRY_NOT_FOUND; status_t status = B_ENTRY_NOT_FOUND;
//TRACE(("rld.so: search_container_in_path_list() %s in %.*s\n", name, TRACE(("runtime_loader: search_container_in_path_list() %s in %.*s\n", name,
// pathListLen, pathList)); pathListLen, pathList));
while (pathListLen > 0) { while (pathListLen > 0) {
const char *pathEnd = pathList; const char *pathEnd = pathList;
@@ -169,7 +177,15 @@ open_executable(char *name, image_type type, const char *rpath)
if (strchr(name, '/')) { if (strchr(name, '/')) {
// the name already contains a path, we don't have to search for it // the name already contains a path, we don't have to search for it
return _kern_open(-1, name, O_RDONLY, 0); fd = _kern_open(-1, name, O_RDONLY, 0);
if (fd >= 0 || type != B_LIBRARY_IMAGE)
return fd;
// Even though ELF specs don't say this, we give shared libraries
// another chance and look them up in the usual search paths - at
// least that seems to be what BeOS does, and since it doesn't hurt...
paths = strrchr(name, '/');
memmove(name, paths, strlen(paths) + 1);
} }
// first try rpath (DT_RPATH) // first try rpath (DT_RPATH)
@@ -202,7 +218,7 @@ open_executable(char *name, image_type type, const char *rpath)
if (fd >= 0) { if (fd >= 0) {
// we found it, copy path! // we found it, copy path!
//TRACE(("rld.so: open_container(%s): found at %s\n", name, buffer)); TRACE(("runtime_loader: open_container(%s): found at %s\n", name, buffer));
strlcpy(name, buffer, PATH_MAX); strlcpy(name, buffer, PATH_MAX);
} }