Index: lib/libedit/filecomplete.c
===================================================================
RCS file: /home/netbsd/src/lib/libedit/filecomplete.c,v
retrieving revision 1.57
diff -p -u -r1.57 filecomplete.c
--- lib/libedit/filecomplete.c	28 Jul 2019 09:27:29 -0000	1.57
+++ lib/libedit/filecomplete.c	30 Aug 2019 12:02:01 -0000
@@ -173,24 +173,6 @@ needs_dquote_escaping(char c)
 	}
 }
 
-
-static wchar_t *
-unescape_string(const wchar_t *string, size_t length)
-{
-	size_t i;
-	size_t j = 0;
-	wchar_t *unescaped = el_calloc(length + 1, sizeof(*string));
-	if (unescaped == NULL)
-		return NULL;
-	for (i = 0; i < length ; i++) {
-		if (string[i] == '\\')
-			continue;
-		unescaped[j++] = string[i];
-	}
-	unescaped[j] = 0;
-	return unescaped;
-}
-
 static char *
 escape_filename(EditLine * el, const char *filename)
 {
@@ -572,7 +554,9 @@ find_word_to_complete(const wchar_t * cu
 {
 	/* We now look backwards for the start of a filename/variable word */
 	const wchar_t *ctemp = cursor;
+	int cursor_at_quote;
 	size_t len;
+	wchar_t *temp;
 
 	/* if the cursor is placed at a slash or a quote, we need to find the
 	 * word before it
@@ -582,34 +566,30 @@ find_word_to_complete(const wchar_t * cu
 		case '\\':
 		case '\'':
 		case '"':
+			cursor_at_quote = 1;
 			ctemp--;
 			break;
 		default:
-			break;
+			cursor_at_quote = 0;
 		}
-	}
+	} else
+		cursor_at_quote = 0;
 
-	for (;;) {
-		if (ctemp <= buffer)
-			break;
-		if (wcschr(word_break, ctemp[-1])) {
-			if (ctemp - buffer >= 2 && ctemp[-2] == '\\') {
-				ctemp -= 2;
-				continue;
-			} else
-				break;
-		}
-		if (special_prefixes && wcschr(special_prefixes, ctemp[-1]))
-			break;
+	while (ctemp > buffer
+	    && !wcschr(word_break, ctemp[-1])
+	    && (!special_prefixes || !wcschr(special_prefixes, ctemp[-1])))
 		ctemp--;
-	}
 
-	len = (size_t) (cursor - ctemp);
-	*length = len;
-	wchar_t *unescaped_word = unescape_string(ctemp, len);
-	if (unescaped_word == NULL)
+	len = (size_t) (cursor - ctemp - cursor_at_quote);
+	temp = el_malloc((len + 1) * sizeof(*temp));
+	if (temp == NULL)
 		return NULL;
-	return unescaped_word;
+	(void) wcsncpy(temp, ctemp, len);
+	temp[len] = '\0';
+	if (cursor_at_quote)
+		len++;
+	*length = len;
+	return temp;
 }
 
 /*
@@ -635,7 +615,6 @@ fn_complete(EditLine *el,
 	const LineInfoW *li;
 	wchar_t *temp;
 	char **matches;
-	char *completion;
 	size_t len;
 	int what_to_do = '\t';
 	int retval = CC_NORM;
@@ -690,32 +669,33 @@ fn_complete(EditLine *el,
 
 		if (matches[0][0] != '\0') {
 			el_deletestr(el, (int) len);
-			if (!attempted_completion_function)
-				completion = escape_filename(el, matches[0]);
-			else
-				completion = strdup(matches[0]);
-			if (completion == NULL)
-				goto out;
 			if (single_match) {
 				/*
 				 * We found exact match. Add a space after
 				 * it, unless we do filename completion and the
 				 * object is a directory. Also do necessary escape quoting
 				 */
+				char *completion;
+				if (!attempted_completion_function)
+					completion = escape_filename(el, matches[0]);
+				else
+					completion = strdup(matches[0]);
+				if (completion == NULL)
+					goto out;
 				el_winsertstr(el,
 					ct_decode_string(completion, &el->el_scratch));
 				el_winsertstr(el,
 						ct_decode_string((*app_func)(completion),
 							&el->el_scratch));
+				free(completion);
 			} else {
 				/*
 				 * Only replace the completed string with common part of
 				 * possible matches if there is possible completion.
 				 */
 				el_winsertstr(el,
-					ct_decode_string(completion, &el->el_scratch));
+					ct_decode_string(matches[0], &el->el_scratch));
 			}
-			free(completion);
 		}