Compare commits
2 Commits
689d9bfcf6
...
master
Author | SHA1 | Date | |
---|---|---|---|
ba1a347dca | |||
bcbc1ef5c4 |
12
dmenu.c
12
dmenu.c
@ -550,19 +550,21 @@ static void
|
|||||||
readstdin(void)
|
readstdin(void)
|
||||||
{
|
{
|
||||||
char *line = NULL;
|
char *line = NULL;
|
||||||
size_t i, junk, size = 0;
|
size_t i, junk, itemsiz = 0;
|
||||||
ssize_t len;
|
ssize_t len;
|
||||||
|
|
||||||
/* read each line from stdin and add it to the item list */
|
/* read each line from stdin and add it to the item list */
|
||||||
for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++) {
|
for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++) {
|
||||||
if (i + 1 >= size / sizeof *items)
|
if (i + 1 >= itemsiz) {
|
||||||
if (!(items = realloc(items, (size += BUFSIZ))))
|
itemsiz += 256;
|
||||||
die("cannot realloc %zu bytes:", size);
|
if (!(items = realloc(items, itemsiz * sizeof(*items))))
|
||||||
|
die("cannot realloc %zu bytes:", itemsiz * sizeof(*items));
|
||||||
|
}
|
||||||
if (line[len - 1] == '\n')
|
if (line[len - 1] == '\n')
|
||||||
line[len - 1] = '\0';
|
line[len - 1] = '\0';
|
||||||
items[i].text = line;
|
items[i].text = line;
|
||||||
items[i].out = 0;
|
items[i].out = 0;
|
||||||
line = NULL;
|
line = NULL; /* next call of getline() allocates a new line */
|
||||||
}
|
}
|
||||||
free(line);
|
free(line);
|
||||||
if (items)
|
if (items)
|
||||||
|
Reference in New Issue
Block a user