caskd/bemenu
1
0
Fork 0
forked from RepoMirrors/bemenu
Code Pull Requests Activity

client: use getline(3)

Browse Source 
Not sure why the code didn't use this function previously, but
getline(3) is mandatory since POSIX.1-2008 and should thus be supported
by all maintstream operating systems. The proposed changes make the code
easier to read and should also make it more efficient memory-wise as it
does not necessarily cause the entire input to be copied into memory at
once.
This commit is contained in:
Sören Tempel 2021-04-03 02:47:00 +02:00 committed by Jari Vetoniemi
parent 92bc5329ca
commit 38395e92c7
1 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client/bemenu.c
View File

@ -14,48 +14,27 @@ read_items_to_menu_from_stdin(struct bm_menu *menu)
{
assert(menu);
size_t step = 1024, allocated;
char *buffer;
ssize_t n;
size_t llen = 0;
char *line = NULL;
if (!(buffer = malloc((allocated = step))))
return;
// TODO: do not read everything into memory
size_t read;
while ((read = fread(buffer + (allocated - step), 1, step, stdin)) == step) {
void *tmp;
if (!(tmp = realloc(buffer, (allocated += step)))) {
free(buffer);
fprintf(stderr, "Out of memory\n");
return;
}
buffer = tmp;
}
// make sure we can null terminate the input
const size_t end = allocated - step + read;
assert(end != ~(size_t)0);
if (end >= allocated && !(buffer = realloc(buffer, end + 1))) {
fprintf(stderr, "Out of memory\n");
return;
}
buffer[end] = 0;
char *s = buffer;
while ((size_t)(s - buffer) < end && *s != 0) {
const size_t pos = strcspn(s, "\n");
s[pos] = 0;
while ((n = getline(&line, &llen, stdin)) != -1) {
// Remove trailing newline
assert(n >= 1);
line[n - 1] = '\0';
struct bm_item *item;
if (!(item = bm_item_new(s)))
if (!(item = bm_item_new(line)))
break;
bm_menu_add_item(menu, item);
s += pos + 1;
}
free(line);
free(buffer);
if (ferror(stdin)) {
fprintf(stderr, "getline failed");
return;
}
}
static void