aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpancake <nopcode.org>2010-04-01 19:30:21 +0200
committerpancake <nopcode.org>2010-04-01 19:30:21 +0200
commit7ffe51981607c72abc969b23e79a1a46f6e2e422 (patch)
tree4509781190cfa844a8e13196d6f1e93e3d25b59c
parent29686bd1b8513ba7512ab089cfdbc7df44986409 (diff)
apply nibble patch removing per-item length limit
-rw-r--r--dmenu.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/dmenu.c b/dmenu.c
index 4c87d6a..f6552aa 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -622,24 +622,31 @@ match(char *pattern) {
622void 622void
623readstdin(void) { 623readstdin(void) {
624 char *p, buf[1024]; 624 char *p, buf[1024];
625 unsigned int len = 0, max = 0; 625 unsigned int len = 0, blen = 0, max = 0;
626 Item *i, *new; 626 Item *i, *new;
627 627
628 i = NULL; 628 i = 0, p = NULL;
629 while(fgets(buf, sizeof buf, stdin)) { 629 while(fgets(buf, sizeof buf, stdin)) {
630 len = strlen(buf); 630 len += (blen = strlen(buf));
631 if(buf[len-1] == '\n') 631 if(!(p = realloc(p, len))) {
632 buf[--len] = '\0'; 632 eprint("fatal: could not realloc() %u bytes\n", len);
633 if(!(p = strdup(buf))) 633 return;
634 eprint("fatal: could not strdup() %u bytes\n", len); 634 }
635 memcpy (p + len - blen, buf, blen);
636 if (p[len - 1] == '\n')
637 p[len - 1] = 0;
638 else if (!feof(stdin))
639 continue;
635 if(max < len) { 640 if(max < len) {
636 maxname = p; 641 maxname = p;
637 max = len; 642 max = len;
638 } 643 }
644 len = 0;
639 if(!(new = (Item *)malloc(sizeof(Item)))) 645 if(!(new = (Item *)malloc(sizeof(Item))))
640 eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); 646 eprint("fatal: could not malloc() %u bytes\n", sizeof(Item));
641 new->next = new->left = new->right = NULL; 647 new->next = new->left = new->right = NULL;
642 new->text = p; 648 new->text = p;
649 p = NULL;
643 if(!i) 650 if(!i)
644 allitems = new; 651 allitems = new;
645 else 652 else