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

Fixed a few issues in the glue code for SWI-Prolog compatibility.

This commit is contained in:
Roberto Bagnara 2010-12-19 20:45:01 +01:00 committed by Vitor Santos Costa
parent 95281f78ee
commit 02fbaf958a
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/dialect/swi/fli/swi.c
View File

@ -459,16 +459,19 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
if (!(flags & (CVT_ATOM|CVT_ATOMIC|CVT_WRITE|CVT_WRITE_CANONICAL|CVT_ALL))) if (!(flags & (CVT_ATOM|CVT_ATOMIC|CVT_WRITE|CVT_WRITE_CANONICAL|CVT_ALL)))
return cv_error(flags); return cv_error(flags);
if (IsWideAtom(at)) { if (IsWideAtom(at)) {
size_t sz = wcslen(RepAtom(at)->WStrOfAE)*sizeof(wchar_t); wchar_t* s = RepAtom(at)->WStrOfAE;
if (!(tmp = ensure_space(sp, (sz+1)*sizeof(wchar_t), flags))) size_t sz = wcslen(s)+1;
if (!(tmp = ensure_space(sp, sz*sizeof(wchar_t), flags)))
return 0; return 0;
// FIXME: I don't think this is the right thing to do here!
memcpy(*sp,s,sz*sizeof(wchar_t));
} else { } else {
char *s = RepAtom(at)->StrOfAE; char *s = RepAtom(at)->StrOfAE;
size_t sz = strlen(RepAtom(at)->StrOfAE)+1; size_t sz = strlen(s)+1;
if (!(tmp = ensure_space(sp, sz, flags))) if (!(tmp = ensure_space(sp, sz, flags)))
return 0; return 0;
strncpy(*sp,s,sz); memcpy(*sp,s,sz);
} }
} else if (IsNumTerm(t)) { } else if (IsNumTerm(t)) {
if (IsFloatTerm(t)) { if (IsFloatTerm(t)) {
@ -520,7 +523,7 @@ X_API int PL_get_chars(term_t l, char **sp, unsigned flags)
char *nbf = PL_malloc(sz+1); char *nbf = PL_malloc(sz+1);
if (!nbf) if (!nbf)
return 0; return 0;
strncpy(nbf,tmp,sz+1); memcpy(nbf,tmp,sz+1);
free(tmp); free(tmp);
*sp = nbf; *sp = nbf;
} }
@ -890,7 +893,7 @@ X_API atom_t PL_new_atom_nchars(size_t len, const char *c)
return 0L; return 0L;
} }
} }
strncpy(pt, c, len); memcpy(pt, c, len);
pt[len] = '\0'; pt[len] = '\0';
} else { } else {
pt = (char *)c; pt = (char *)c;
@ -1102,7 +1105,8 @@ X_API int PL_put_atom_nchars(term_t t, size_t len, const char *s)
return FALSE; return FALSE;
} }
} }
strncpy(buf, s, len); memcpy(buf, s, len);
buf[len] = 0;
} else { } else {
buf = (char *)s; buf = (char *)s;
} }
@ -1547,7 +1551,7 @@ X_API int PL_unify_atom_nchars(term_t t, size_t len, const char *s)
if (!buf) if (!buf)
return FALSE; return FALSE;
strncpy(buf, s, len); memcpy(buf, s, len);
buf[len] = '\0'; buf[len] = '\0';
while (!(catom = Yap_LookupAtom(buf))) { while (!(catom = Yap_LookupAtom(buf))) {
if (!Yap_growheap(FALSE, 0L, NULL)) { if (!Yap_growheap(FALSE, 0L, NULL)) {
@ -1857,7 +1861,7 @@ LookupMaxAtom(size_t n, char *s)
if (!buf) if (!buf)
return FALSE; return FALSE;
strncpy(buf, s, n); memcpy(buf, s, n);
buf[n] = '\0'; buf[n] = '\0';
while (!(catom = Yap_LookupAtom(buf))) { while (!(catom = Yap_LookupAtom(buf))) {
if (!Yap_growheap(FALSE, 0L, NULL)) { if (!Yap_growheap(FALSE, 0L, NULL)) {