Commit Diff

Commit:
ba1a347dcaba055f824161007dfee60db3ea785b
From:
Hiltjo Posthuma <hiltjo@codemadness.org>
Date:
Message:
readstdin: allocate amount of items Keep track of the amount of items (not a total buffer size), allocate an array of new items. For now change BUFSIZ bytes to 256 * sizeof(struct item)).
Actions:
Patch | Tree
commit - bcbc1ef5c4cf4875a4d66e7dc0919da88a6096a5
commit + ba1a347dcaba055f824161007dfee60db3ea785b
blob - 8d96b6ca1e46eaf1f31905a71e7d0eb5d97b5ee2
blob + 27b7a30f0af26ef5d3c0e72c318673c38ab72150
--- dmenu.c
+++ dmenu.c
@@ -550,14 +550,16 @@ static void
 readstdin(void)
 {
 	char *line = NULL;
-	size_t i, junk, size = 0;
+	size_t i, junk, itemsiz = 0;
 	ssize_t len;
 
 	/* read each line from stdin and add it to the item list */
 	for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++) {
-		if (i + 1 >= size / sizeof *items)
-			if (!(items = realloc(items, (size += BUFSIZ))))
-				die("cannot realloc %zu bytes:", size);
+		if (i + 1 >= itemsiz) {
+			itemsiz += 256;
+			if (!(items = realloc(items, itemsiz * sizeof(*items))))
+				die("cannot realloc %zu bytes:", itemsiz * sizeof(*items));
+		}
 		if (line[len - 1] == '\n')
 			line[len - 1] = '\0';
 		items[i].text = line;