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

make base name and dirname compatible with other prologs

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-02-13 20:32:26 +00:00
parent 4138e46955
commit df0b3d3a0d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
os/files.c
View File

@ -485,7 +485,7 @@ file_base_name ( USES_REGS1 )
} else { } else {
const char *c = RepAtom(at)->StrOfAE; const char *c = RepAtom(at)->StrOfAE;
char *s; char *s;
#if HAVE_BASENAME #if HAVE_BASENAME && 0 // DISABLED: Linux basename is not compatible with file_base_name in SWI and GNU
char c1[YAP_FILENAME_MAX+1]; char c1[YAP_FILENAME_MAX+1];
strncpy( c1, c, YAP_FILENAME_MAX); strncpy( c1, c, YAP_FILENAME_MAX);
s = basename( c1 ); s = basename( c1 );
@ -523,7 +523,7 @@ file_directory_name ( USES_REGS1 )
return Yap_unify(ARG2, MkAtomTerm(Yap_LookupWideAtom(s))); return Yap_unify(ARG2, MkAtomTerm(Yap_LookupWideAtom(s)));
} else { } else {
const char *c = RepAtom(at)->StrOfAE; const char *c = RepAtom(at)->StrOfAE;
#if HAVE_BASENAME #if HAVE_BASENAME && 0 // DISABLED: Linux basename is not compatible with file_base_name in SWI and GNU
const char *s; const char *s;
char c1[YAP_FILENAME_MAX+1]; char c1[YAP_FILENAME_MAX+1];
strncpy( c1, c, YAP_FILENAME_MAX); strncpy( c1, c, YAP_FILENAME_MAX);
@ -532,10 +532,8 @@ file_directory_name ( USES_REGS1 )
char s[YAP_FILENAME_MAX+1]; char s[YAP_FILENAME_MAX+1];
Int i = strlen(c); Int i = strlen(c);
while (i && !Yap_dir_separator((int)c[--i])); while (i && !Yap_dir_separator((int)c[--i]));
if (Yap_dir_separator((int)c[i])) {
i++;
}
strncpy(s, c, i); strncpy(s, c, i);
s[i] = '\0';
#endif #endif
return Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom(s))); return Yap_unify(ARG2, MkAtomTerm(Yap_LookupAtom(s)));
} }