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

go back to storing multibyte characters in non-dynamically allocated 

arrays of MB_LEN_MAX length, as it's less complex


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2175 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2004-12-07 22:24:03 +00:00
parent 43953bba6f
commit eae97caa83
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nano.c
View File

@ -3567,13 +3567,13 @@ void do_output(int *kbinput, size_t kbinput_len)
/* Do we have to call edit_refresh(), or can we get away with /* Do we have to call edit_refresh(), or can we get away with
* update_line()? */ * update_line()? */
char *key = charalloc( char key[
#ifdef NANO_WIDE #ifdef NANO_WIDE
MB_CUR_MAX MB_LEN_MAX
#else #else
1 1
#endif #endif
); /* The current multibyte character we have. */ ]; /* The current multibyte character we have. */
int key_len; /* The length of the current multibyte int key_len; /* The length of the current multibyte
* character. */ * character. */
@ -3665,8 +3665,6 @@ void do_output(int *kbinput, size_t kbinput_len)
#endif #endif
} }
free(key);
/* Turn constant cursor position display back on if it was on /* Turn constant cursor position display back on if it was on
* before. */ * before. */
if (old_constupdate) if (old_constupdate)

5
src/winio.c
View File

@ -263,18 +263,17 @@ void unget_input(buffer *input, size_t input_len)
#ifdef NANO_WIDE #ifdef NANO_WIDE
if (!ISSET(NO_UTF8)) { if (!ISSET(NO_UTF8)) {
size_t i; size_t i;
char *key = charalloc(MB_CUR_MAX);
/* Change all invalid wide character values to -1. */ /* Change all invalid wide character values to -1. */
for (i = 0; i < input_len; i++) { for (i = 0; i < input_len; i++) {
char key[MB_LEN_MAX];
if (!input[i].key_code) { if (!input[i].key_code) {
if (wctomb(key, input[i].key) == -1) if (wctomb(key, input[i].key) == -1)
input[i].key = -1; input[i].key = -1;
} }
} }
free(key);
/* Save all of the non-(-1) wide characters in another /* Save all of the non-(-1) wide characters in another
* buffer. */ * buffer. */
for (i = 0; i < input_len; i++) { for (i = 0; i < input_len; i++) {