p/termo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid push_bytes() entirely by read()ing directly into tk->buffer

Browse Source
This commit is contained in:
Paul LeoNerd Evans 2012-01-18 10:07:36 +00:00
parent 9534330003
commit 3474a45b14
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
termkey.c
View File

@ -940,29 +940,17 @@ retry:
/* UNREACHABLE */
}
static void push_bytes(TermKey *tk, const unsigned char *input, size_t inputlen)
{
if(tk->buffstart + tk->buffcount + inputlen > tk->buffsize) {
while(tk->buffstart + tk->buffcount + inputlen > tk->buffsize)
tk->buffsize *= 2;
unsigned char *newbuffer = realloc(tk->buffer, tk->buffsize);
// TODO: Handle realloc() failure
tk->buffer = newbuffer;
}
// Not strcpy just in case of NUL bytes
memcpy(tk->buffer + tk->buffstart + tk->buffcount, input, inputlen);
tk->buffcount += inputlen;
}
TermKeyResult termkey_advisereadable(TermKey *tk)
{
unsigned char buffer[64]; // Smaller than the default size
ssize_t len;
if(tk->buffstart) {
memmove(tk->buffer, tk->buffer + tk->buffstart, tk->buffcount);
tk->buffstart = 0;
}
retry:
len = read(tk->fd, buffer, sizeof buffer);
len = read(tk->fd, tk->buffer + tk->buffcount, tk->buffsize - tk->buffcount);
if(len == -1) {
if(errno == EAGAIN)
@ -977,7 +965,7 @@ retry:
return TERMKEY_RES_NONE;
}
else {
push_bytes(tk, buffer, len);
tk->buffcount += len;
return TERMKEY_RES_AGAIN;
}
}