djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

file.readline(): Use mp_obj_str_get_data() and fix off-by-one error on EOF.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-01-22 10:34:45 +02:00
parent 5fa93b6755
commit 0914371faf
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
py/stream.c
View File

@ -130,7 +130,15 @@ static mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) {
if (out_sz == -1) { if (out_sz == -1) {
nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_OSError, "[Errno %d]", error)); nlr_jump(mp_obj_new_exception_msg_varg(MP_QSTR_OSError, "[Errno %d]", error));
} }
if (out_sz == 0 || *p == '\n') { if (out_sz == 0) {
// Back out previously added byte
// TODO: This is a bit hacky, does it supported by vstr API contract?
// Consider, what's better - read a char and get OutOfMemory (so read
// char is lost), or allocate first as we do.
vstr_add_len(vstr, -1);
break;
}
if (*p == '\n') {
break; break;
} }
} }
@ -141,9 +149,9 @@ static mp_obj_t stream_unbuffered_readline(uint n_args, const mp_obj_t *args) {
mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) { mp_obj_t mp_stream_unbuffered_iter(mp_obj_t self) {
mp_obj_t l_in = stream_unbuffered_readline(1, &self); mp_obj_t l_in = stream_unbuffered_readline(1, &self);
const char *l = qstr_str(MP_OBJ_QSTR_VALUE(l_in)); uint sz;
// TODO: \0 mp_obj_str_get_data(l_in, &sz);
if (*l != 0) { if (sz != 0) {
return l_in; return l_in;
} }
return mp_const_stop_iteration; return mp_const_stop_iteration;