X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=53ef8e60d03f6d7afc4d5b9d7e3b7a2e71c97deb;hp=636e224158a965ab68c0685c93411fe4767ea991;hb=a22e734cd89015a71d0dd7cf895799c440805847;hpb=8a63543fdfbd3b5d00e4afecfbc397795a49ed04

diff --git a/http_recv.c b/http_recv.c
index 636e2241..53ef8e60 100644
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -49,7 +49,7 @@ struct private_http_recv_data {
 	 * The file descriptor used for receiving the http stream.
 	 *
 	 * The pre_select function of the http receiver adds this file descriptor to
-	 * the set of file decriptors which are checked for reading/writing (depending
+	 * the set of file descriptors which are checked for reading/writing (depending
 	 * on the current status) by the select loop of the application (para_audiod or
 	 * para_recv).
 	 *
@@ -95,7 +95,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	struct btr_node *btrn = rn->btrn;
 	int ret;
 	char *buf;
-	size_t sz;
+	size_t sz, n;
 
 	t->error = 0;
 	ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
@@ -130,13 +130,11 @@ static void http_recv_post_select(struct sched *s, struct task *t)
 	sz = btr_pool_get_buffer(phd->btrp, &buf);
 	if (sz == 0)
 		goto err;
-	ret = recv_bin_buffer(phd->fd, buf, sz);
-	if (ret == 0)
-		ret = -E_RECV_EOF;
-	if (ret < 0)
-		goto err;
-	btr_add_output_pool(phd->btrp, ret, btrn);
-	return;
+	ret = read_nonblock(phd->fd, buf, sz, &s->rfds, &n);
+	if (n > 0)
+		btr_add_output_pool(phd->btrp, n, btrn);
+	if (ret >= 0)
+		return;
 err:
 	btr_remove_node(rn->btrn);
 	t->error = ret;