From 49fb982071e08074af83b2319bbd762d8ced262f Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 28 Jan 2022 01:51:15 +0300 Subject: [PATCH 1/2] replaced unneeded code copy-paste with proper base64 encode function usage --- 0.76_My_PuTTY/terminal.c | 21 +-------------------- 0.76_My_PuTTY/windows/window.c | 22 ++-------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/0.76_My_PuTTY/terminal.c b/0.76_My_PuTTY/terminal.c index b40bd39..19294fc 100644 --- a/0.76_My_PuTTY/terminal.c +++ b/0.76_My_PuTTY/terminal.c @@ -3726,30 +3726,11 @@ static void do_osc(Terminal *term) // ok, let us try to answer something // base64-encode - // result in null-terminated char* out base64_encodestate _state; base64_init_encodestate(&_state); - char* out = malloc(reply_size*2); int count = base64_encode_block((char*)reply, reply_size, out, &_state); - // finishing '=' characters - char* next_char = out + count; - switch (_state.step) - { - case step_B: - *next_char++ = base64_encode_value(_state.result); - *next_char++ = '='; - *next_char++ = '='; - break; - case step_C: - *next_char++ = base64_encode_value(_state.result); - *next_char++ = '='; - break; - case step_A: - break; - } - count = next_char - out; - out[count] = 0; + count += base64_encode_blockend(out + count, &_state); // send escape seq diff --git a/0.76_My_PuTTY/windows/window.c b/0.76_My_PuTTY/windows/window.c index 3fc7c32..7a11565 100644 --- a/0.76_My_PuTTY/windows/window.c +++ b/0.76_My_PuTTY/windows/window.c @@ -5696,29 +5696,11 @@ if( (GetKeyState(VK_MENU)&0x8000) && (wParam==VK_SPACE) ) { memcpy(kev + 14, &type, sizeof(type)); // base64-encode kev - // result in null-terminated char* out - base64_encodestate _state; + base64_encodestate _state; base64_init_encodestate(&_state); char* out = malloc(15*2); int count = base64_encode_block(kev, 15, out, &_state); - // finishing '=' characters - char* next_char = out + count; - switch (_state.step) - { - case step_B: - *next_char++ = base64_encode_value(_state.result); - *next_char++ = '='; - *next_char++ = '='; - break; - case step_C: - *next_char++ = base64_encode_value(_state.result); - *next_char++ = '='; - break; - case step_A: - break; - } - count = next_char - out; - out[count] = 0; + count += base64_encode_blockend(out + count, &_state); // send escape seq From 36e5f53fedae619ae34ec4fafe422ec0699c28a5 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Fri, 28 Jan 2022 01:59:17 +0300 Subject: [PATCH 2/2] cosmetic --- 0.76_My_PuTTY/windows/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0.76_My_PuTTY/windows/window.c b/0.76_My_PuTTY/windows/window.c index 7a11565..c3667e6 100644 --- a/0.76_My_PuTTY/windows/window.c +++ b/0.76_My_PuTTY/windows/window.c @@ -5696,11 +5696,11 @@ if( (GetKeyState(VK_MENU)&0x8000) && (wParam==VK_SPACE) ) { memcpy(kev + 14, &type, sizeof(type)); // base64-encode kev - base64_encodestate _state; + base64_encodestate _state; base64_init_encodestate(&_state); char* out = malloc(15*2); int count = base64_encode_block(kev, 15, out, &_state); - count += base64_encode_blockend(out + count, &_state); + count += base64_encode_blockend(out + count, &_state); // send escape seq