From 8fd18750412964b8397f8683aa67ab8afd55b590 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Mon, 8 Sep 2003 20:52:00 +0000
Subject: [PATCH] make iob_send return aggregate total

---
 io/iob_send.c | 9 +++++++--
 test/iob.c    | 5 ++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/io/iob_send.c b/io/iob_send.c
index a8f1541..5bc4aff 100644
--- a/io/iob_send.c
+++ b/io/iob_send.c
@@ -15,7 +15,7 @@
 int64 iob_send(int64 s,io_batch* b) {
   io_entry* e,* last;
   struct iovec* v;
-  int64 sent;
+  int64 total,sent;
   long i;
   long headers;
 #ifdef BSD_SENDFILE
@@ -25,6 +25,7 @@ int64 iob_send(int64 s,io_batch* b) {
   if (b->bytesleft==0) return 0;
   last=array_start(&b->b)+array_bytes(&b->b);
   v=alloca(b->bufs*sizeof(struct iovec));
+  total=0;
   for (;;) {
     if (!(e=array_get(&b->b,sizeof(io_entry),b->next)))
       return -1;		/* can't happen error */
@@ -67,6 +68,10 @@ int64 iob_send(int64 s,io_batch* b) {
     else
       sent=io_sendfile(s,e->fd,e->offset,e->n);
 #endif
+    if (sent>0)
+      total+=sent;
+    else
+      if (!total) return -1;
     if (sent==b->bytesleft) {
       b->bytesleft=0;
       break;
@@ -86,5 +91,5 @@ int64 iob_send(int64 s,io_batch* b) {
     } else break;
   }
 abort:
-  return sent;
+  return total;
 }
diff --git a/test/iob.c b/test/iob.c
index 78ddee7..e33dc90 100644
--- a/test/iob.c
+++ b/test/iob.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include "iob.h"
+#include "buffer.h"
 
 main() {
   int64 fd;
@@ -9,5 +10,7 @@ main() {
   assert(iob_addbuf(b,"Huhu",4));
   assert(iob_addbuf(b," fnord\n",7));
   assert(iob_addfile(b,fd,10,10));
-  iob_send(1,b);
+  buffer_puts(buffer_2,"iob_send returned ");
+  buffer_putlong(buffer_2,iob_send(1,b));
+  buffer_putsflush(buffer_2,".\n");
 }