From 547e358796b9d82041b94f18f9ddcb972b8f1e7e Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Fri, 21 May 2004 22:31:07 +0000 Subject: do input buffering in while sleeping loop of sending stuff to output buffer git-svn-id: https://svn.musicpd.org/mpd/trunk@1125 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/inputStream_http.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/inputStream_http.c') diff --git a/src/inputStream_http.c b/src/inputStream_http.c index 1e88db114..c9cde55f2 100644 --- a/src/inputStream_http.c +++ b/src/inputStream_http.c @@ -542,20 +542,20 @@ int inputStream_httpBuffer(InputStream * inStream) { readed = read(data->sock, data->buffer+data->buflen, (size_t)(HTTP_BUFFER_SIZE-1-data->buflen)); - if(readed < 0 && (errno == EAGAIN || errno == EINTR)); + if(readed < 0 && (errno == EAGAIN || errno == EINTR)) { + readed = 0; + } else if(readed <= 0) { close(data->sock); data->connState = HTTP_CONN_STATE_CLOSED; + readed = 0; } - else { - /*fwrite(data->buffer+data->buflen,1,readed,stdout);*/ - data->buflen += readed; - } - + /*fwrite(data->buffer+data->buflen,1,readed,stdout);*/ + data->buflen += readed; } if(data->buflen > HTTP_PREBUFFER_SIZE) data->prebuffer = 0; - return 0; + return (readed ? 1 : 0); } /* vim:set shiftwidth=8 tabstop=8 expandtab: */ -- cgit v1.2.3