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)).
This commit is contained in:
		
							
								
								
									
										10
									
								
								dmenu.c
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								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;
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user