avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set MSVC readline version to 0x0502, some cleanup

This commit is contained in:
Marius Greuel 2023-01-04 18:02:01 +01:00
parent 7b3cfd2724
commit c2a90f41f0
1 changed files with 7 additions and 11 deletions
src/msvc
readline.cpp

18
src/msvc/readline.cpp
View File

@ -13,9 +13,8 @@
#include "readline/readline.h" #include "readline/readline.h"
#include "readline/history.h" #include "readline/history.h"
int rl_readline_version = 0x0500; int rl_readline_version = 0x0502;
static char* rl_prompt;
static rl_vcpfunc_t* rl_handler; static rl_vcpfunc_t* rl_handler;
static std::unique_ptr<std::thread> rl_thread; static std::unique_ptr<std::thread> rl_thread;
static std::mutex rl_mutex; static std::mutex rl_mutex;
@ -34,8 +33,11 @@ static void get_line_thread()
static void call_handler(const char* string) static void call_handler(const char* string)
{ {
rl_thread->join(); if (rl_thread)
rl_thread = nullptr; {
rl_thread->join();
rl_thread = nullptr;
}
if (rl_handler != nullptr) if (rl_handler != nullptr)
{ {
@ -78,19 +80,13 @@ void rl_callback_read_char(void)
void rl_callback_handler_install(char* prompt, rl_vcpfunc_t* handler) void rl_callback_handler_install(char* prompt, rl_vcpfunc_t* handler)
{ {
rl_prompt = _strdup(prompt);
rl_handler = handler; rl_handler = handler;
std::cout << rl_prompt; std::cout << prompt;
} }
void rl_callback_handler_remove(void) void rl_callback_handler_remove(void)
{ {
if (rl_prompt != nullptr)
{
free(rl_prompt);
}
rl_handler = nullptr; rl_handler = nullptr;
} }