From 2820734ec01ad6d2e1a0611fa480c3dd533588c7 Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Sat, 25 Oct 2014 17:18:41 +0300
Subject: Fix stdin read.

---
 client/client.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'client')

diff --git a/client/client.c b/client/client.c
index 9d9a3a4..95c270e 100644
--- a/client/client.c
+++ b/client/client.c
@@ -234,10 +234,14 @@ read_items_to_menu_from_stdin(struct bm_menu *menu)
     }
     buffer[allocated - step + read - 1] = 0;
 
-    size_t pos;
     char *s = buffer;
-    while ((pos = strcspn(s, "\n")) != 0) {
-        size_t next = pos + (s[pos] != 0);
+    while ((size_t)(s - buffer) < allocated - step + read) {
+        size_t pos = strcspn(s, "\n");
+        if (pos == 0) {
+            s += 1;
+            continue;
+        }
+
         s[pos] = 0;
 
         struct bm_item *item;
@@ -245,7 +249,7 @@ read_items_to_menu_from_stdin(struct bm_menu *menu)
             break;
 
         bm_menu_add_item(menu, item);
-        s += next;
+        s += pos + 1;
     }
 
     free(buffer);
-- 
cgit v1.2.3-70-g09d2