X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=354c9ed509deddc14f4528ce318e0d1ad90a8b7e;hp=005583cf52bf425f67727df68600c1094a3c0ad8;hb=4744d937c4160898d1fe151257606430750e580c;hpb=f32c0776882e01913c64c8ccbf2d94e0fb4d6369

diff --git a/send_common.c b/send_common.c
index 005583cf..354c9ed5 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <osl.h>
 
 #include "para.h"
@@ -23,6 +22,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. */
@@ -113,7 +113,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);
@@ -261,6 +261,7 @@ void generic_com_off(struct sender_status *ss)
  * Accept a connection on the socket this server is listening on.
  *
  * \param ss The sender whose listening fd is ready for reading.
+ * \param rfds Passed to para_accept(),
  *
  * This must be called only if the socket fd of \a ss is ready for reading.  It
  * calls para_accept() to accept the connection and performs the following