Utils/Console: Fix singleton instantiation order (ServerManager / Scheduler)

[senf.git] / Console / Readline.cc

diff --git a/Console/Readline.cc b/Console/Readline.cc
index 16bcfa0..f1597d4 100644 (file)
--- a/Console/Readline.cc
+++ b/Console/Readline.cc
@@ -72,7 +72,7 @@ namespace {
     int readline_getc_function(FILE *)
     {
         if (senf::console::detail::ReadlineClientReader::active())
-            return senf::console::detail::ReadlineClientReader::instance().getc()
+            return senf::console::detail::ReadlineClientReader::instance().getc();
         else
             return -1;
     }
@@ -150,6 +150,7 @@ prefix_ senf::console::detail::ReadlineClientReader::ReadlineClientReader(Client
                               0xFF, 0xFB, 0x03, // IAC WILL SGA
                               0x00 };
     handle().write(options, options+sizeof(options));
+    handle().write(std::string("(readline support enabled)\r\n"));
 
     strncpy(promptBuffer_, promptString().c_str(), 1024);
     promptBuffer_[1023] = 0;
@@ -197,7 +198,7 @@ prefix_ void senf::console::detail::ReadlineClientReader::v_translate(std::strin
     boost::replace_all(data, "\xff", "\xff\xff");
 }
 
-prefix_ void senf::console::detail::ReadlineClientReader::charEvent(Scheduler::EventId event)
+prefix_ void senf::console::detail::ReadlineClientReader::charEvent(int event)
 {
     char ch;
     if (event != Scheduler::EV_READ || handle().read(&ch, &ch+1) <= &ch) {