mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-08 20:41:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

(complete_engine, insert_text): don't calculate text length twice.

Browse Source 
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2021-10-10 17:33:50 +03:00
parent e71972003e
commit 8010b08584
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/widget/input_complete.c
View File

@ -983,7 +983,11 @@ insert_text (WInput * in, char *text, ssize_t size)
text_len = strlen (text); text_len = strlen (text);
buff_len = str_length (in->buffer); buff_len = str_length (in->buffer);
size = MIN (size, (ssize_t) text_len) + start - end; if (size < 0)
size = (ssize_t) text_len;
else
size = MIN (size, (ssize_t) text_len);
size += start - end;
if (strlen (in->buffer) + size >= (size_t) in->current_max_size) if (strlen (in->buffer) + size >= (size_t) in->current_max_size)
{ {
/* Expand the buffer */ /* Expand the buffer */
@ -1210,7 +1214,7 @@ complete_engine (WInput * in, int what_to_do)
{ {
char *lc_complete = in->completions[0]; char *lc_complete = in->completions[0];
if (!insert_text (in, lc_complete, strlen (lc_complete)) || in->completions[1] != NULL) if (!insert_text (in, lc_complete, -1) || in->completions[1] != NULL)
tty_beep (); tty_beep ();
else else
input_complete_free (in); input_complete_free (in);
@ -1278,7 +1282,7 @@ complete_engine (WInput * in, int what_to_do)
{ {
listbox_get_current (complete_list, &q, NULL); listbox_get_current (complete_list, &q, NULL);
if (q != NULL) if (q != NULL)
insert_text (in, q, strlen (q)); insert_text (in, q, -1);
} }
if (q != NULL || end != min_end) if (q != NULL || end != min_end)
input_complete_free (in); input_complete_free (in);