i3bar: Split JSON line logic to read_json_input

[i3/i3] / i3bar / src / child.c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 058ddb7a1f31c0518b20ae4afc6e38a6c65db85b..9236de3fb99f7f32f5496d71046b2c3fa82e16bc 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -148,11 +148,10 @@ static int stdin_end_array(void *context) {
 }
 
 /*
- * Callbalk for stdin. We read a line from stdin and store the result
- * in statusline
+ * Helper function to read stdin
  *
  */
-void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
+static unsigned char *get_buffer(ev_io *watcher, int *ret_buffer_len) {
     int fd = watcher->fd;
     int n = 0;
     int rec = 0;
@@ -174,7 +173,8 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
             ELOG("stdin: received EOF\n");
             cleanup();
             draw_bars();
-            return;
+            *ret_buffer_len = -1;
+            return NULL;
         }
         rec += n;
 
@@ -185,9 +185,46 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
     }
     if (*buffer == '\0') {
         FREE(buffer);
-        return;
+        rec = -1;
     }
+    *ret_buffer_len = rec;
+    return buffer;
+}
+
+static void read_flat_input(char *buffer, int length) {
+    struct status_block *first = TAILQ_FIRST(&statusline_head);
+    /* Clear the old buffer if any. */
+    I3STRING_FREE(first->full_text);
+    /* Remove the trailing newline and terminate the string at the same
+     * time. */
+    if (buffer[length-1] == '\n' || buffer[length-1] == '\r')
+        buffer[length-1] = '\0';
+    else buffer[length] = '\0';
+    first->full_text = i3string_from_utf8(buffer);
+}
+
+static void read_json_input(unsigned char *input, int length) {
+    yajl_status status = yajl_parse(parser, input, length);
+#if YAJL_MAJOR >= 2
+    if (status != yajl_status_ok) {
+#else
+    if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
+#endif
+        fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
+                status, length, input);
+    }
+}
 
+/*
+ * Callbalk for stdin. We read a line from stdin and store the result
+ * in statusline
+ *
+ */
+void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
+    int rec;
+    unsigned char *buffer = get_buffer(watcher, &rec);
+    if (buffer == NULL)
+        return;
     unsigned char *json_input = buffer;
     if (first_line) {
         DLOG("Detecting input type based on buffer *%.*s*\n", rec, buffer);
@@ -195,7 +232,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
         unsigned int consumed = 0;
         /* At the moment, we don’t care for the version. This might change
          * in the future, but for now, we just discard it. */
-        plaintext = (determine_json_version(buffer, buffer_len, &consumed) == -1);
+        plaintext = (determine_json_version(buffer, rec, &consumed) == -1);
         if (plaintext) {
             /* In case of plaintext, we just add a single block and change its
              * full_text pointer later. */
@@ -208,25 +245,9 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
         first_line = false;
     }
     if (!plaintext) {
-        yajl_status status = yajl_parse(parser, json_input, rec);
-#if YAJL_MAJOR >= 2
-        if (status != yajl_status_ok) {
-#else
-        if (status != yajl_status_ok && status != yajl_status_insufficient_data) {
-#endif
-            fprintf(stderr, "[i3bar] Could not parse JSON input (code %d): %.*s\n",
-                    status, rec, json_input);
-        }
+        read_json_input(json_input, rec);
     } else {
-        struct status_block *first = TAILQ_FIRST(&statusline_head);
-        /* Clear the old buffer if any. */
-        I3STRING_FREE(first->full_text);
-        /* Remove the trailing newline and terminate the string at the same
-         * time. */
-        if (buffer[rec-1] == '\n' || buffer[rec-1] == '\r')
-            buffer[rec-1] = '\0';
-        else buffer[rec] = '\0';
-        first->full_text = i3string_from_utf8((const char *)buffer);
+        read_flat_input((char*)buffer, rec);
     }
     free(buffer);
     draw_bars();