[PR-194] - tidy up code, create a generic write wrapper to simplify code.

Fix #1177

diff --git a/src/tcp.c b/src/tcp.c
index 88f37a0225298ca7e1c3b02acfea66edb346a45a..001c4709420f0789aaac0ec1c8817382c04307c5 100644 (file)
--- a/src/tcp.c
+++ b/src/tcp.c
@@ -181,31 +181,16 @@ int
 tcp_write_queue(int fd, htsbuf_queue_t *q)
 {
   htsbuf_data_t *hd;
-  int l, r = 0, l2;
-  uint8_t* p;
+  int l, r = 0;
+  void *p;
 
   while((hd = TAILQ_FIRST(&q->hq_q)) != NULL) {
     TAILQ_REMOVE(&q->hq_q, hd, hd_link);
 
-    l = hd->hd_data_len - hd->hd_data_off;
-    p = hd->hd_data + hd->hd_data_off;
-
-    while(l > 0) {
-      l2 = write(fd, p, l);
-      if(l2 < 0) {
-        perror("tcp_write_queue");
-        if(errno == EINTR) {
-          continue;
-        } else {
-          break;
-        }
-      }
-      l -= l2;
-      p += l2;
-    }
-
-    if(l == 0) {
-      r = 1;
+    if (!r) {
+      l = hd->hd_data_len - hd->hd_data_off;
+      p = hd->hd_data + hd->hd_data_off;
+      r = tvh_write(fd, p, l);
     }
 
     free(hd->hd_data);

diff --git a/src/tvheadend.h b/src/tvheadend.h
index 8ad66cd04db2c360418a9f3ab1abc2fc817fba63..23018afee8efd7da27030a4efb09348da80e13bd 100644 (file)
--- a/src/tvheadend.h
+++ b/src/tvheadend.h
@@ -454,6 +454,8 @@ int tvh_socket(int domain, int type, int protocol);
 
 int tvh_pipe(int flags, th_pipe_t *pipe);
 
+int tvh_write(int fd, void *buf, size_t len);
+
 void hexdump(const char *pfx, const uint8_t *data, int len);
 
 uint32_t tvh_crc32(uint8_t *data, size_t datalen, uint32_t crc);

diff --git a/src/webui/webui.c b/src/webui/webui.c
index c6f2b8d5c1a5537b4c53e1441053b09fb6f6f293..8fbb31db37d2d4f250f84182fe9d5931519c910c 100644 (file)
--- a/src/webui/webui.c
+++ b/src/webui/webui.c
@@ -98,12 +98,12 @@ page_root2(http_connection_t *hc, const char *remain, void *opaque)
 static int
 page_static_file(http_connection_t *hc, const char *remain, void *opaque)
 {
-  int ret = 0, r;
+  int ret = 0;
   const char *base = opaque;
   char path[500];
   ssize_t size;
   const char *content = NULL, *postfix;
-  char buf[4096], *p;
+  char buf[4096];
   const char *gzip;
 
   if(remain == NULL)
@@ -139,21 +139,7 @@ page_static_file(http_connection_t *hc, const char *remain, void *opaque)
       ret = 500;
       break;
     }
-    p = buf;
-    while(c > 0) {
-      r = write(hc->hc_fd, p, c);
-      if(r < 0) {
-        perror("page_static_file");
-        if(errno == EINTR) {
-          continue;
-        } else {
-          break;
-        }
-      }
-      c -= r;
-      p += r;
-    }
-    if (c != 0) {
+    if (tvh_write(hc->hc_fd, buf, c)) {
       ret = 500;
       break;
     }

diff --git a/src/wrappers.c b/src/wrappers.c
index fd374ec878c01d872e296e443c1468ddf9a80a45..febe6a8c3dfe9593205632878db0b916de2c5d40 100644 (file)
--- a/src/wrappers.c
+++ b/src/wrappers.c
@@ -48,3 +48,24 @@ tvh_pipe(int flags, th_pipe_t *p)
   pthread_mutex_unlock(&fork_lock);
   return err;
 }
+
+int
+tvh_write(int fd, void *buf, size_t len)
+{
+  ssize_t c;
+
+  while (len) {
+    c = write(fd, buf, len);
+    if (c < 0) {
+      if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK) {
+        usleep(100);
+        continue;
+      }
+      break;
+    }
+    len -= c;
+    buf += c;
+  }
+
+  return len ? 1 : 0;
+}