sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "iostream.c: Fix ast_iostream_gets() needlessly returning failure." into 16

This commit is contained in:
George Joseph 2018-09-05 09:53:29 -05:00 committed by Gerrit Code Review
parent cfb854e241 f6a165208b
commit 10460501ca
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
main/iostream.c
View File

@ -285,46 +285,59 @@ ssize_t ast_iostream_read(struct ast_iostream *stream, void *buffer, size_t coun
ssize_t ast_iostream_gets(struct ast_iostream *stream, char *buffer, size_t size)
{
ssize_t r;
size_t remaining = size;
ssize_t accum_size = 0;
ssize_t len;
char *newline;
do {
for (;;) {
/* Search for newline */
newline = memchr(stream->rbufhead, '\n', stream->rbuflen);
if (newline) {
r = newline - stream->rbufhead + 1;
if (r > size-1) {
r = size-1;
len = newline - stream->rbufhead + 1;
if (len > remaining - 1) {
len = remaining - 1;
}
break;
}
/* Enough data? */
if (stream->rbuflen >= size - 1) {
r = size - 1;
/* Enough buffered line data to fill request buffer? */
if (stream->rbuflen >= remaining - 1) {
len = remaining - 1;
break;
}
/* Try to fill in line buffer */
if (stream->rbuflen && stream->rbuf != stream->rbufhead) {
memmove(&stream->rbuf, stream->rbufhead, stream->rbuflen);
if (stream->rbuflen) {
/* Put leftover buffered line data into request buffer */
memcpy(buffer + accum_size, stream->rbufhead, stream->rbuflen);
remaining -= stream->rbuflen;
accum_size += stream->rbuflen;
stream->rbuflen = 0;
}
stream->rbufhead = stream->rbuf;
r = iostream_read(stream, stream->rbufhead + stream->rbuflen, sizeof(stream->rbuf) - stream->rbuflen);
if (r <= 0) {
return r;
len = iostream_read(stream, stream->rbuf, sizeof(stream->rbuf));
if (len == 0) {
/* Nothing new was read. Return whatever we have accumulated. */
break;
}
stream->rbuflen += r;
} while (1);
if (len < 0) {
if (accum_size) {
/* We have an accumulated buffer so return that instead. */
len = 0;
break;
}
return len;
}
stream->rbuflen += len;
}
/* Return r bytes with termination byte */
memcpy(buffer, stream->rbufhead, r);
buffer[r] = 0;
stream->rbuflen -= r;
stream->rbufhead += r;
/* Return read buffer string length */
memcpy(buffer + accum_size, stream->rbufhead, len);
buffer[accum_size + len] = 0;
stream->rbuflen -= len;
stream->rbufhead += len;
return r;
return accum_size + len;
}
ssize_t ast_iostream_discard(struct ast_iostream *stream, size_t size)