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

fixes

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-09-08 22:34:45 -05:00
parent e2f8430e00
commit c78f3e085a
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
C/tracer.c
View File

@ -50,27 +50,32 @@ static char *send_tracer_message(char *start, char *name, Int arity,
} }
if (args) { if (args) {
for (i = 0; i < arity; i++) { for (i = 0; i < arity; i++) {
if (i > 0) { size_t length = top - (s + 4);
s += snprintf(s, top - s, ","); if ((ssize_t)length < 16) {
s[0] = '\0';
return s;
}
if (i > 0) {
*s++ = ',';
} }
size_t length = top - (s + 2); const char *sn = Yap_TermToString(args[i], NULL, LOCAL_encoding,
const char *sn = Yap_TermToString(args[i], &length, LOCAL_encoding,
Quote_illegal_f | Handle_vars_f); Quote_illegal_f | Handle_vars_f);
if (sn != s) { size_t sz;
if (sn != s) {
if (sn == NULL) { if (sn == NULL) {
strcpy(s, "<* error *>"); sn = "<* error *>";
} else { }
strcpy(s, sn); strlcpy(s, sn, top - (s + 3));
}
} }
s += strlen(s); sz = strlen(s);
s += sz;
} }
if (arity) { if (arity) {
*s++ = ')'; *s++ = ')';
} }
} }
} }
*s++ = '\n'; s[0] = '\0';
return s; return s;
} }
@ -410,8 +415,10 @@ void low_level_trace__(yap_low_level_port port, PredEntry *pred, CELL *args) {
} }
UNLOCK(Yap_low_level_trace_lock); UNLOCK(Yap_low_level_trace_lock);
#if __ANDROID__ #if __ANDROID__
__android_log_print(ANDROID_LOG_DEBUG, "YAPDroid", "%s", buf); __android_log_print(ANDROID_LOG_DEBUG, "YAPDroid", "%s\n", buf);
#else #else
*b++ = '\n';
*b++ = '\0';
fputs(buf, stderr); fputs(buf, stderr);
#endif #endif
} }