ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add multibyte/wide character support to input_tab(), so that we don't 

end up with a string that contains only part of a multibyte character
during tab completion


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2560 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-05-27 13:06:18 +00:00
parent 217f241be5
commit aff5a1c6b1
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -57,6 +57,9 @@ CVS code -
- Rename variable next to nextdir to avoid confusion. (DLR)
input_tab()
- Since list is a bool, assign it FALSE instead of 0. (DLR)
- Add multibyte/wide character support, so that we don't end up
with a string that contains only part of a multibyte
character during tab completion. (DLR)
do_browser()
- Don't treat NANO_CANCEL_KEY as NANO_EXIT_KEY anymore, for
consistency. (DLR)

18
src/files.c
View File

@ -2180,20 +2180,32 @@ char *input_tab(char *buf, size_t *place, bool *lastwastab, bool *list)
const char *lastslash = revstrstr(buf, "/", buf + *place);
size_t lastslash_len = (lastslash == NULL) ? 0 :
lastslash - buf + 1;
char *match1_mb = charalloc(mb_cur_max() + 1);
char *match2_mb = charalloc(mb_cur_max() + 1);
int match1_mb_len, match2_mb_len;
while (TRUE) {
for (match = 1; match < num_matches; match++) {
if (matches[0][common_len] !=
matches[match][common_len])
match1_mb_len = parse_mbchar(matches[0] + common_len,
match1_mb, NULL, NULL);
match2_mb_len = parse_mbchar(matches[match] +
common_len, match2_mb, NULL, NULL);
match1_mb[match1_mb_len] = '\0';
match2_mb[match2_mb_len] = '\0';
if (strcmp(match1_mb, match2_mb) != 0)
break;
}
if (match < num_matches || matches[0][common_len] == '\0')
break;
common_len++;
common_len += parse_mbchar(buf + common_len, NULL, NULL,
NULL);
}
free(match1_mb);
free(match2_mb);
mzero = charalloc(lastslash_len + common_len + 1);
sprintf(mzero, "%.*s%.*s", lastslash_len, buf, common_len,
matches[0]);