diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TrueFileName changed name :)

Browse Source
This commit is contained in:
Vítor Santos Costa
2016-02-13 02:56:19 +00:00
parent 52a2d00d0c
commit 48db20515f
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
C/load_dl.c
View File

@@ -142,6 +142,7 @@ Yap_LoadForeignFile(char *file, int flags)
dlflag |= RTLD_LOCAL;
#endif
if (!Yap_TrueFileName(file, LOCAL_FileNameBuf, true)){
if (!Yap_locateFile(file, LOCAL_FileNameBuf, true)){
/* use LD_LIBRARY_PATH */
strncpy(LOCAL_FileNameBuf,file, YAP_FILENAME_MAX-1);
strncat(LOCAL_FileNameBuf,".", YAP_FILENAME_MAX-1);
@@ -194,7 +195,7 @@ LoadForeign(StringList ofiles, StringList libs,
CACHE_REGS
while (libs) {
if (!Yap_TrueFileName((char *)AtomName(libs->name), LOCAL_FileNameBuf, true)) {
if (!Yap_locateFile((char *)AtomName(libs->name), LOCAL_FileNameBuf, true)) {
/* use LD_LIBRARY_PATH */
strncpy(LOCAL_FileNameBuf, (char *)AtomName(libs->name), YAP_FILENAME_MAX);
}
@@ -218,7 +219,6 @@ LoadForeign(StringList ofiles, StringList libs,
other routines */
/* dlopen wants to follow the LD_CONFIG_PATH */
if (!Yap_TrueFileName((char *)AtomName(ofiles->name), LOCAL_FileNameBuf, TRUE)) {
strcpy(LOCAL_ErrorSay, "%% Trying to open unexisting file in LoadForeign");
return LOAD_FAILLED;
}