MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-28 00:14:07 +01:00
Code Issues Releases Wiki Activity

construct: Remove console readline; use fs::stdin::readline.

Browse source
This commit is contained in:
Jason Volk 2018-03-23 15:37:49 -07:00
parent a08670cf48
commit 9306e7c32e
1 changed files with 4 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
construct/console.cc
View file

@ -35,7 +35,6 @@ bool console_active;
bool console_inwork;
ircd::ctx::ctx *console_ctx;
ircd::module *console_module;
boost::asio::posix::stream_descriptor *console_in;
static void check_console_active();
static void console_fini();
@ -110,34 +109,24 @@ try
const unwind atexit([]
{
delete console_in; console_in = nullptr;
console_fini();
});
console_init();
console_in = new boost::asio::posix::stream_descriptor
{
*::ios, dup(STDIN_FILENO)
};
boost::asio::streambuf buf{BUFSIZE};
std::istream is{&buf};
std::string line;
std::cout << console_message << generic_message;
while(1)
{
std::cout << "\n> " << std::flush;
char buf[1024];
string_view line;
// Suppression scope ends after the command is entered
// so the output of the command (if log messages) can be seen.
{
const log::console_quiet quiet(false);
boost::asio::async_read_until(*console_in, buf, '\n', yield_context{to_asio{}});
line = fs::stdin::readline(buf);
}
std::getline(is, line);
std::cin.clear();
if(line.empty())
continue;
@ -357,17 +346,8 @@ try
if(!console_active)
return;
if(console_inwork && console_ctx)
{
if(console_ctx)
interrupt(*console_ctx);
return;
}
if(console_in)
{
console_in->cancel();
console_in->close();
}
}
catch(const std::exception &e)
{