diff options
author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2022-10-31 11:52:30 +0100 |
---|---|---|
committer | Rafael Marçalo <raroma09@gmail.com> | 2022-11-01 15:06:59 +0000 |
commit | b5f961fb13ee39724e5fcbff5d3d2a81669586bf (patch) | |
tree | 6c637e0bc15276e519b7d8e1c9ec99d86a36273b | |
parent | 834ced0f1454eedc18e17b459f7496e00c1b4284 (diff) |
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)).
-rw-r--r-- | dmenu.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -557,7 +557,7 @@ static void readstdin(void) { char *line = NULL; - size_t i, junk, size = 0; + size_t i, junk, itemsiz = 0; ssize_t len; if(passwd){ inputw = lines = 0; @@ -566,9 +566,11 @@ readstdin(void) /* 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; |