Read all available data

Author: codeation

four/io.c

@@ -78,21 +78,29 @@ static void reset_buffer(pipe_buffer *target) {
 
 static gboolean async_read_chan(GIOChannel *source, GIOCondition condition, gpointer data) {
     pipe_buffer *target = data;
-    gsize len = 0;
-    GIOStatus status = g_io_channel_read_chars(source, target->buffer, target->size, &len, NULL);
-    if (status != G_IO_STATUS_NORMAL) {
-        printf("read status: %d\n", status);
-        exit(EXIT_FAILURE);
+    while (TRUE) {
+        gsize len = 0;
+        GIOStatus status = g_io_channel_read_chars(source, target->buffer, target->size, &len, NULL);
+        switch (status) {
+        case G_IO_STATUS_NORMAL:
+            if (len < target->size) {
+                // shift
+                target->buffer += len;
+                target->size -= len;
+                // no more data
+                return TRUE;
+            }
+            // else call next func after getting data
+            target->next_func(target);
+            break;
+        case G_IO_STATUS_AGAIN:
+            // no more data
+            return TRUE;
+        default:
+            printf("read status: %d\n", status);
+            exit(EXIT_FAILURE);
+        }
     }
-    if (len < target->size) {
-        // shift
-        target->buffer += len;
-        target->size -= len;
-    } else {
-        // call next func after getting data
-        target->next_func(target);
-    }
-    return TRUE;
 }
 
 static gboolean chan_error_func(GIOChannel *source, GIOCondition condition, gpointer data) {
@@ -115,7 +123,7 @@ static void io_start(FILE *source, pipe_buffer *target, gboolean is_stream) {
         exit(EXIT_FAILURE);
     }
     if (is_stream) {
-        g_io_channel_set_buffer_size(chan, 64LU * 1024LU);
+        g_io_channel_set_buffer_size(chan, 65536UL);
     }
     target->in_id = g_io_add_watch(chan, G_IO_IN, async_read_chan, target);
     target->hup_id = g_io_add_watch(chan, G_IO_HUP, chan_error_func, target);

io.c

@@ -78,21 +78,29 @@ static void reset_buffer(pipe_buffer *target) {
 
 static gboolean async_read_chan(GIOChannel *source, GIOCondition condition, gpointer data) {
     pipe_buffer *target = data;
-    gsize len = 0;
-    GIOStatus status = g_io_channel_read_chars(source, target->buffer, target->size, &len, NULL);
-    if (status != G_IO_STATUS_NORMAL) {
-        printf("read status: %d\n", status);
-        exit(EXIT_FAILURE);
+    while (TRUE) {
+        gsize len = 0;
+        GIOStatus status = g_io_channel_read_chars(source, target->buffer, target->size, &len, NULL);
+        switch (status) {
+        case G_IO_STATUS_NORMAL:
+            if (len < target->size) {
+                // shift
+                target->buffer += len;
+                target->size -= len;
+                // no more data
+                return TRUE;
+            }
+            // else call next func after getting data
+            target->next_func(target);
+            break;
+        case G_IO_STATUS_AGAIN:
+            // no more data
+            return TRUE;
+        default:
+            printf("read status: %d\n", status);
+            exit(EXIT_FAILURE);
+        }
     }
-    if (len < target->size) {
-        // shift
-        target->buffer += len;
-        target->size -= len;
-    } else {
-        // call next func after getting data
-        target->next_func(target);
-    }
-    return TRUE;
 }
 
 static gboolean chan_error_func(GIOChannel *source, GIOCondition condition, gpointer data) {
@@ -115,7 +123,7 @@ static void io_start(FILE *source, pipe_buffer *target, gboolean is_stream) {
         exit(EXIT_FAILURE);
     }
     if (is_stream) {
-        g_io_channel_set_buffer_size(chan, 64LU * 1024LU);
+        g_io_channel_set_buffer_size(chan, 65536UL);
     }
     target->in_id = g_io_add_watch(chan, G_IO_IN, async_read_chan, target);
     target->hup_id = g_io_add_watch(chan, G_IO_HUP, chan_error_func, target);