/*
- * 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.
*/
* 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).
*
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);
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;