Mirrors_Framework/rt-thread
1
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2026-09-21 18:57:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #822 from parai/upstream

Browse Source 
x86: bring up share object module on i386 machine
This commit is contained in:
Bernard Xiong
2017-08-21 09:30:17 +08:00
committed by GitHub
parent 76a79f20d9 2957cf6f52
commit 1f45d8c723
12 changed files with 167 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/libc/libdl/dlopen.c
+7 -4
View File
@@ -27,7 +27,7 @@ void* dlopen(const char *filename, int flags)
/* check parameters */
RT_ASSERT(filename != RT_NULL);
if (filename[0] != '/') /* it's a absolute path, use it directly */
if (filename[0] != '/') /* it's a relative path, prefix with MODULE_ROOT_DIR */
{
fullpath = rt_malloc(strlen(def_path) + strlen(filename) + 2);
@@ -37,8 +37,7 @@ void* dlopen(const char *filename, int flags)
}
else
{
rt_kprintf("use absolute path\n");
return RT_NULL;
fullpath = (char*)filename; /* absolute path, use it directly */
}
/* find in module list */
@@ -47,7 +46,11 @@ void* dlopen(const char *filename, int flags)
if(module != RT_NULL) module->nref++;
else module = rt_module_open(fullpath);
rt_free(fullpath);
if(fullpath != filename)
{
rt_free(fullpath);
}
return (void*)module;
}