Windows compilation fixes

[libs/core.git] / source / io / console.cpp

diff --git a/source/io/console.cpp b/source/io/console.cpp
index d06b894e10dda771f11773999b18e8ee92c2d204..c846604806aa66e36ea8ce76d37199b7420b4372 100644 (file)
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -1,5 +1,6 @@
 #ifndef WIN32
 #include <errno.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <termios.h>
 #include <sys/ioctl.h>
@@ -13,13 +14,13 @@ using namespace std;
 namespace {
 
 #ifdef WIN32
-DWORD stream_to_sys(Console::Stream stream)
+DWORD stream_to_sys(Msp::IO::Console::Stream stream)
 {
        switch(stream)
        {
-       case INPUT: return STD_INPUT_HANDLE;
-       case OUTPUT: return STD_OUTPUT_HANDLE;
-       case ERROR: return STD_ERROR_HANDLE;
+       case Msp::IO::Console::CIN: return STD_INPUT_HANDLE;
+       case Msp::IO::Console::COUT: return STD_OUTPUT_HANDLE;
+       case Msp::IO::Console::CERR: return STD_ERROR_HANDLE;
        default: throw invalid_argument("stream_to_sys");
        }
 }
@@ -36,25 +37,25 @@ namespace IO {
 Console::Console(Stream s):
        stream(s)
 {
-       mode = (stream==INPUT ? M_READ : M_WRITE);
+       mode = (stream==CIN ? M_READ : M_WRITE);
 
 #ifdef WIN32
        *handle = GetStdHandle(stream_to_sys(stream));
 #else
        *handle = stream;
 
-       if(stream==INPUT)
+       if(stream==CIN)
                tcgetattr(*handle, &orig_attr);
 #endif
 
-       if(stream==INPUT)
+       if(stream==CIN)
                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32
-       if(stream==INPUT)
+       if(stream==CIN)
                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
@@ -125,6 +126,16 @@ void Console::get_size(unsigned &rows, unsigned &cols)
 #endif
 }
 
+void Console::redirect(Base &other)
+{
+       Handle other_handle = other.get_handle(mode&M_RDWR);
+#ifdef WIN32
+       SetStdHandle(stream_to_sys(stream), *other_handle);
+#else
+       dup2(*other_handle, *handle);
+#endif
+}
+
 unsigned Console::do_write(const char *buf, unsigned len)
 {
        check_access(M_WRITE);
@@ -145,23 +156,23 @@ unsigned Console::do_read(char *buf, unsigned len)
 
 Console &Console::instance(Stream s)
 {
-       static Console in(INPUT);
-       static Console out(OUTPUT);
-       static Console err(ERROR);
+       static Console in(CIN);
+       static Console out(COUT);
+       static Console err(CERR);
 
        switch(s)
        {
-       case INPUT: return in;
-       case OUTPUT: return out;
-       case ERROR: return err;
+       case CIN: return in;
+       case COUT: return out;
+       case CERR: return err;
        }
 
        throw invalid_argument("Console::instance");
 }
 
-Console &cin = Console::instance(Console::INPUT);
-Console &cout = Console::instance(Console::OUTPUT);
-Console &cerr = Console::instance(Console::ERROR);
+Console &cin = Console::instance(Console::CIN);
+Console &cout = Console::instance(Console::COUT);
+Console &cerr = Console::instance(Console::CERR);
 
 } // namespace IO
 } // namespace Msp