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 22:30:20 -0000
@@ -183,8 +183,8 @@ unescape_string(const wchar_t *string, s
 	if (unescaped == NULL)
 		return NULL;
 	for (i = 0; i < length ; i++) {
-		if (string[i] == '\\')
-			continue;
+		if (string[i] == '\\' && i < length)
+			i++;
 		unescaped[j++] = string[i];
 	}
 	unescaped[j] = 0;
@@ -192,7 +192,7 @@ unescape_string(const wchar_t *string, s
 }
 
 static char *
-escape_filename(EditLine * el, const char *filename)
+escape_filename(EditLine * el, const char *filename, int close_quote)
 {
 	size_t original_len = 0;
 	size_t escaped_character_count = 0;
@@ -243,7 +243,7 @@ escape_filename(EditLine * el, const cha
 	}
 
 	newlen = original_len + escaped_character_count + 1;
-	if (s_quoted || d_quoted)
+	if (close_quote && (s_quoted || d_quoted))
 		newlen++;
 
 	if ((escaped_str = el_malloc(newlen)) == NULL)
@@ -286,10 +286,12 @@ escape_filename(EditLine * el, const cha
 	}
 
 	/* close the quotes */
-	if (s_quoted)
-		escaped_str[offset++] = '\'';
-	else if (d_quoted)
-		escaped_str[offset++] = '"';
+	if (close_quote) {
+		if (s_quoted)
+			escaped_str[offset++] = '\'';
+		else if (d_quoted)
+			escaped_str[offset++] = '"';
+	}
 
 	escaped_str[offset] = 0;
 	return escaped_str;
@@ -573,6 +575,7 @@ 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;
 	size_t len;
+	int cursor_at_quote = 0;
 
 	/* if the cursor is placed at a slash or a quote, we need to find the
 	 * word before it
@@ -582,6 +585,7 @@ find_word_to_complete(const wchar_t * cu
 		case '\\':
 		case '\'':
 		case '"':
+			cursor_at_quote = 1;
 			ctemp--;
 			break;
 		default:
@@ -604,11 +608,13 @@ find_word_to_complete(const wchar_t * cu
 		ctemp--;
 	}
 
-	len = (size_t) (cursor - ctemp);
-	*length = len;
+	len = (size_t) (cursor - ctemp - cursor_at_quote);
 	wchar_t *unescaped_word = unescape_string(ctemp, len);
 	if (unescaped_word == NULL)
 		return NULL;
+	if (cursor_at_quote)
+		len++;
+	*length = len;
 	return unescaped_word;
 }
 
@@ -691,7 +697,8 @@ fn_complete(EditLine *el,
 		if (matches[0][0] != '\0') {
 			el_deletestr(el, (int) len);
 			if (!attempted_completion_function)
-				completion = escape_filename(el, matches[0]);
+				completion = escape_filename(el, matches[0],
+				    single_match);
 			else
 				completion = strdup(matches[0]);
 			if (completion == NULL)