Commit 7db06d075ad187df0eea72f764cfa9c149bf8a01
2022-05-13T08:00:46
fix loading libraries
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
diff --git a/librtbuf/rtbuf_lib.c b/librtbuf/rtbuf_lib.c
index 7ad9ee8..d5392dd 100644
--- a/librtbuf/rtbuf_lib.c
+++ b/librtbuf/rtbuf_lib.c
@@ -101,7 +101,7 @@ void rtbuf_lib_delete (s_rtbuf_lib *rl)
data_delete(&g_rtbuf_lib_alloc, rl);
}
-const char * rtbuf_lib_find_in_path (const char *name)
+int rtbuf_lib_load_path (s_rtbuf_lib *lib, const char *name)
{
char **path = g_rtbuf_lib_path;
while (*path) {
@@ -111,34 +111,33 @@ const char * rtbuf_lib_find_in_path (const char *name)
g_str_append(name, strlen(name));
ext = g_str_append(".so", 4);
printf("lib find in path \"%s\"\n", lib_path);
- if (access(lib_path, R_OK) == 0)
- return lib_path;
+ if (access(lib_path, R_OK) == 0 &&
+ (lib->lib = dlopen(lib_path, RTLD_NOW))) {
+ lib->path = lib_path;
+ return 1;
+ }
g_str_reset(ext);
g_str_append(".so.0.0", 8);
printf("lib find in path \"%s\"\n", lib_path);
- if (access(lib_path, R_OK) == 0)
- return lib_path;
+ if (access(lib_path, R_OK) == 0 &&
+ (lib->lib = dlopen(lib_path, RTLD_NOW))) {
+ lib->path = lib_path;
+ return 1;
+ }
g_str_reset(ext);
g_str_append("-0.dll", 7);
printf("lib find in path \"%s\"\n", lib_path);
- if (access(lib_path, R_OK) == 0)
- return lib_path;
+ if (access(lib_path, R_OK) == 0 &&
+ (lib->lib = dlopen(lib_path, RTLD_NOW))) {
+ lib->path = lib_path;
+ return 1;
+ }
g_str_reset(lib_path);
path++;
}
return 0;
}
-void rtbuf_lib_load_path (s_rtbuf_lib *lib, const char *name)
-{
- const char *path = rtbuf_lib_find_in_path(name);
- if (path) {
- printf("lib load path \"%s\"\n", path);
- lib->path = path;
- lib->lib = dlopen(lib->path, RTLD_LAZY);
- }
-}
-
int rtbuf_lib_proc_p (s_rtbuf_lib_proc *proc)
{
return proc->name || proc->f || proc->start || proc->stop;