commit - 7b0c40c82789d19547f4af4e8da4d98f4dccb72f
commit + 678b809be24c5e109fbe2cac37bdc89347489c73
blob - 577a0e0f641066b49d635e2a1ad8060b843927bb
blob + fba55d9edd2cc372036026cc99396d06db262923
--- mymenu.c
+++ mymenu.c
@@ -345,10 +345,9 @@ popc(char *p)
 void
 popw(char *w)
 {
-	int len;
 	short in_word = 1;
 
-	if ((len = strlen(w)) == 0)
+	if (*w == '\0')
 		return;
 
 	while (1) {
@@ -1361,21 +1360,17 @@ loop(struct rendering *r, char **text, int *textlen, s
 				r->offset = 0;
 				break;
 
-			case ADD_CHAR: {
-				int str_len;
-
-				str_len = strlen(input);
-
+			case ADD_CHAR:
 				/*
 				 * sometimes a strange key is pressed
 				 * i.e. ctrl alone), so input will be
 				 * empty. Don't need to update
 				 * completion in that case
 				 */
-				if (str_len == 0)
+				if (*input == '\0')
 					break;
 
-				for (i = 0; i < str_len; ++i) {
+				for (i = 0; input[i] != '\0'; ++i) {
 					*textlen = pushc(text, *textlen,
 					    input[i]);
 					if (*textlen == -1) {
@@ -1395,7 +1390,6 @@ loop(struct rendering *r, char **text, int *textlen, s
 
 				r->offset = 0;
 				break;
-			}
 
 			case TOGGLE_FIRST_SELECTED:
 				r->first_selected = !r->first_selected;