mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2024-11-22 12:51:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

input: elide an extra buffer for inserting stuff into the text

Browse Source 
Do the casting from integer to character rightaway in the first
intermediate buffer.
This commit is contained in:
Benno Schulenberg 2016-06-26 14:08:05 +02:00
parent 24b10179a1
commit 067b0a3367
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/nano.c
View File

@ -1569,7 +1569,7 @@ int do_input(bool allow_funcs)
{
int input;
/* The keystroke we read in: a character or a shortcut. */
static int *puddle = NULL;
static char *puddle = NULL;
/* The input buffer for actual characters. */
static size_t depth = 0;
/* The length of the input buffer. */
@ -1625,9 +1625,9 @@ int do_input(bool allow_funcs)
if (ISSET(VIEW_MODE))
print_view_warning();
else {
depth++;
puddle = (int *)nrealloc(puddle, depth * sizeof(int));
puddle[depth - 1] = input;
/* Store the byte, and leave room for a terminating zero. */
puddle = charealloc(puddle, depth + 2);
puddle[depth++] = (char)input;
}
}
@ -1644,18 +1644,10 @@ int do_input(bool allow_funcs)
#endif
if (puddle != NULL) {
/* Display all the characters in the input buffer at
* once, filtering out control characters. */
char *output = charalloc(depth + 1);
size_t i;
for (i = 0; i < depth; i++)
output[i] = (char)puddle[i];
output[i] = '\0';
do_output(output, depth, FALSE);
free(output);
/* Insert all bytes in the input buffer into the edit buffer
* at once, filtering out any low control codes. */
puddle[depth] = '\0';
do_output(puddle, depth, FALSE);
/* Empty the input buffer. */
free(puddle);