X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/86468aafe52a94ce6ba1a3601a587c65724a61aa..fb67bd666ed22a28caff505f3319184735e05311:/dmenu.c

diff --git a/dmenu.c b/dmenu.c
index b6f1ef2..cf5e4a6 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -38,7 +38,7 @@ static void setup(void);
 
 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;
@@ -66,7 +66,6 @@ main(int argc, char *argv[]) {
 	Bool fast = False;
 	int i;
 
-	progname = "dmenu";
 	for(i = 1; i < argc; i++)
 		/* single flags */
 		if(!strcmp(argv[i], "-v")) {
@@ -79,7 +78,7 @@ main(int argc, char *argv[]) {
 			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"))
@@ -221,9 +220,9 @@ void
 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();
 }
@@ -383,10 +382,9 @@ keypress(XKeyEvent *ev) {
 
 void
 match(void) {
-	size_t len;
+	size_t len = strlen(text);
 	Item *item, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
 
-	len = strlen(text);
 	matches = lexact = lprefix = lsubstr = matchend = exactend = prefixend = substrend = NULL;
 	for(item = items; item && item->text; item++)
 		if(!fstrncmp(text, item->text, len + 1))
@@ -424,9 +422,8 @@ match(void) {
 
 size_t
 nextrune(int incr) {
-	size_t n, len;
+	size_t n, len = strlen(text);
 
-	len = strlen(text);
 	for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
 	return n;
 }
@@ -447,19 +444,21 @@ paste(void) {
 
 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