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

fix utf-8 reading

Browse Source
This commit is contained in:
Vítor Santos Costa 2016-03-29 01:56:38 +01:00
parent cda490eda8
commit 9f722319ec
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
os/readutil.c
View File

@ -67,7 +67,8 @@ static Int rl_to_codes(Term TEnd, int do_as_binary, int arity USES_REGS) {
if (ch < 0) { if (ch < 0) {
ch = '\n'; ch = '\n';
pt[-1] = '\n'; pt[-1] = '\n';
} else }
} else {
pt += get_utf8(pt, 4, &ch); pt += get_utf8(pt, 4, &ch);
if (pt + 4 == buf + buf_sz) if (pt + 4 == buf + buf_sz)
break; break;
@ -129,6 +130,7 @@ static Int read_line_to_string(USES_REGS1) {
unsigned char *buf; unsigned char *buf;
size_t sz; size_t sz;
StreamDesc *st = GLOBAL_Stream + sno; StreamDesc *st = GLOBAL_Stream + sno;
int ch;
if (sno < 0) if (sno < 0)
return false; return false;
@ -140,8 +142,6 @@ static Int read_line_to_string(USES_REGS1) {
max_inp = (ASP - HR) / 2 - 1024; max_inp = (ASP - HR) / 2 - 1024;
buf = (unsigned char *)TR; buf = (unsigned char *)TR;
buf_sz = (unsigned char *)LOCAL_TrailTop - buf; buf_sz = (unsigned char *)LOCAL_TrailTop - buf;
while (true) {
size_t sz;
if (buf_sz > max_inp) { if (buf_sz > max_inp) {
buf_sz = max_inp; buf_sz = max_inp;
@ -150,25 +150,23 @@ static Int read_line_to_string(USES_REGS1) {
char *b = (char *)TR; char *b = (char *)TR;
sz = fread(b, 1, buf_sz, GLOBAL_Stream[sno].file); sz = fread(b, 1, buf_sz, GLOBAL_Stream[sno].file);
} else { } else {
int ch;
unsigned char *pt = buf; unsigned char *pt = buf;
do { do {
ch = st->stream_wgetc_for_read(sno); ch = st->stream_wgetc_for_read(sno);
if (ch < 127) { if (ch < 127) {
if (ch < 0) { *pt++ = ch;
ch = '\n'; if (ch < 0) {
pt[-1] = '\n'; ch = '\n';
} else pt[-1] = '\n';
*pt++ = ch; }
} else { } else {
pt += put_utf8(pt, ch); pt += get_utf8(pt, 4, &ch);
if (pt + 4 == buf + buf_sz)
break;
} }
if (pt + 4 == buf + buf_sz)
break;
} while (ch != '\n'); } while (ch != '\n');
sz = pt - buf; sz = pt - buf;
} }
}
if (sz == -1 || sz == 0) { if (sz == -1 || sz == 0) {
if (GLOBAL_Stream[sno].status & Eof_Stream_f) { if (GLOBAL_Stream[sno].status & Eof_Stream_f) {
UNLOCK(GLOBAL_Stream[sno].streamlock); UNLOCK(GLOBAL_Stream[sno].streamlock);