X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=send_common.c;h=a16869b07154022bfd9adf4a56250d34a2de16fb;hb=d87806284b9f6be9aab71ccbf0280d273b57eeb3;hp=e786f996ad3b85218d9953a01fee6a86f34b6de4;hpb=32e646780461f96682d1191d31e08e4602ab125e;p=paraslash.git diff --git a/send_common.c b/send_common.c index e786f996..a16869b0 100644 --- a/send_common.c +++ b/send_common.c @@ -1,13 +1,18 @@ /* - * Copyright (C) 2005-2011 Andre Noll + * Copyright (C) 2005-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file send_common.c Functions used by more than one paraslash sender. */ +#include +#include #include #include +#include +#include +#include #include "para.h" #include "error.h" @@ -22,6 +27,7 @@ #include "send.h" #include "close_on_fork.h" #include "chunk_queue.h" +#include "sched.h" #include "vss.h" /** Clients will be kicked if there are more than that many bytes pending. */ @@ -112,7 +118,7 @@ int send_queued_chunks(int fd, struct chunk_queue *cq) int ret; cq_get(qc, &buf, &len); - ret = write_nonblock(fd, buf, len); + ret = xwrite(fd, buf, len); if (ret < 0) return ret; cq_update(cq, ret);