static char text[BUFSIZ] = "";
static int bh, mw, mh;
-static int inputw = 0;
+static int inputw;
static int lines = 0;
static int monitor = -1;
static int promptw;
fast = True;
else if(!strcmp(argv[i], "-i"))
fstrncmp = strncasecmp;
- else if(i == argc-1)
+ else if(i+1 == argc)
goto usage;
/* double flags */
else if(!strcmp(argv[i], "-l"))
insert(const char *s, ssize_t n) {
if(strlen(text) + n > sizeof text - 1)
return;
- memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+ memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
if(n > 0)
- memcpy(text + cursor, s, n);
+ memcpy(&text[cursor], s, n);
cursor += n;
match();
}
void
readstdin(void) {
- char buf[sizeof text], *p;
- size_t i, size = 0;
+ char buf[sizeof text], *p, *maxstr = NULL;
+ size_t i, max = 0, size = 0;
for(i = 0; fgets(buf, sizeof buf, stdin); items[++i].text = NULL) {
- if(i+1 == size / sizeof *items || !items)
+ if(i+1 >= size / sizeof *items)
if(!(items = realloc(items, (size += BUFSIZ))))
eprintf("cannot realloc %u bytes:", size);
if((p = strchr(buf, '\n')))
*p = '\0';
if(!(items[i].text = strdup(buf)))
eprintf("cannot strdup %u bytes:", strlen(buf)+1);
- inputw = MAX(inputw, textw(dc, items[i].text));
+ if(strlen(items[i].text) > max)
+ max = strlen(maxstr = items[i].text);
}
+ inputw = maxstr ? textw(dc, maxstr) : 0;
}
void