Windows compilation fixes

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

diff --git a/source/io/console.cpp b/source/io/console.cpp
index a0e0c28f07cbbd506683cb92166f3def8b57b93a..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>
@@ -12,7 +13,19 @@ using namespace std;
 
 namespace {
 
-#ifndef WIN32
+#ifdef WIN32
+DWORD stream_to_sys(Msp::IO::Console::Stream stream)
+{
+       switch(stream)
+       {
+       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");
+       }
+}
+
+#else
 termios orig_attr;
 #endif
 
@@ -21,35 +34,28 @@ termios orig_attr;
 namespace Msp {
 namespace IO {
 
-Console::Console(unsigned n)
+Console::Console(Stream s):
+       stream(s)
 {
-       if(n>2)
-               throw invalid_argument("Console::Console");
-
-       mode = (n==0 ? M_READ : M_WRITE);
+       mode = (stream==CIN ? M_READ : M_WRITE);
 
 #ifdef WIN32
-       switch(n)
-       {
-       case 0: *handle = GetStdHandle(STD_INPUT_HANDLE); break;
-       case 1: *handle = GetStdHandle(STD_OUTPUT_HANDLE); break;
-       case 2: *handle = GetStdHandle(STD_ERROR_HANDLE); break;
-       }
+       *handle = GetStdHandle(stream_to_sys(stream));
 #else
-       *handle = n;
+       *handle = stream;
 
-       if(n==0)
+       if(stream==CIN)
                tcgetattr(*handle, &orig_attr);
 #endif
 
-       if(n==0)
+       if(stream==CIN)
                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32
-       if(handle==0)
+       if(stream==CIN)
                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
@@ -68,8 +74,7 @@ void Console::set_block(bool b)
 
 void Console::set_local_echo(bool e)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
 #ifdef WIN32
        DWORD m;
@@ -85,26 +90,28 @@ void Console::set_local_echo(bool e)
 
 void Console::set_line_buffer(bool l)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
 #ifdef WIN32
        DWORD m;
-       GetConsoleMode(*handle, &m);
-       SetConsoleMode(*handle, (m&~ENABLE_LINE_INPUT) | (l?ENABLE_LINE_INPUT:0));
+       if(!GetConsoleMode(*handle, &m))
+               throw system_error("GetConsoleMode");
+       if(!SetConsoleMode(*handle, (m&~ENABLE_LINE_INPUT) | (l?ENABLE_LINE_INPUT:0)))
+               throw system_error("SetConsoleMode");
 #else
        // XXX ICANON does more than just set line buffering, may need a bit more thought
        termios t;
-       tcgetattr(*handle, &t);
+       if(tcgetattr(*handle, &t)==-1)
+               throw system_error("tcgetattr");
        t.c_lflag = (t.c_lflag&~ICANON) | (l?ICANON:0);
-       tcsetattr(*handle, TCSADRAIN, &t);
+       if(tcsetattr(*handle, TCSADRAIN, &t)==-1)
+               throw system_error("tcsetattr");
 #endif
 }
 
 void Console::get_size(unsigned &rows, unsigned &cols)
 {
-       if(!(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
+       check_access(M_WRITE);
 
 #ifdef WIN32
        // XXX Figure out how to do this
@@ -112,74 +119,60 @@ void Console::get_size(unsigned &rows, unsigned &cols)
        cols = 80;
 #else
        struct winsize wsz;
-       ioctl(*handle, TIOCGWINSZ, &wsz);
+       if(ioctl(*handle, TIOCGWINSZ, &wsz)==-1)
+               throw system_error("ioctl TIOCGWINSZ");
        rows = wsz.ws_row;
        cols = wsz.ws_col;
 #endif
 }
 
-unsigned Console::do_write(const char *buf, unsigned len)
+void Console::redirect(Base &other)
 {
-       if(!(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
-
+       Handle other_handle = other.get_handle(mode&M_RDWR);
 #ifdef WIN32
-       DWORD ret;
-       if(!WriteFile(*handle, buf, len, &ret, 0))
-               throw system_error("WriteFile");
+       SetStdHandle(stream_to_sys(stream), *other_handle);
 #else
-       int ret = ::write(*handle, buf, len);
-       if(ret==-1)
-               throw system_error("write");
+       dup2(*other_handle, *handle);
 #endif
+}
 
-       return ret;
+unsigned Console::do_write(const char *buf, unsigned len)
+{
+       check_access(M_WRITE);
+
+       return sys_write(handle, buf, len);
 }
 
 unsigned Console::do_read(char *buf, unsigned len)
 {
-       if(!(mode&M_READ))
-               throw invalid_access(M_READ);
+       check_access(M_READ);
 
-#ifdef WIN32
-       DWORD ret;
-       if(!ReadFile(*handle, buf, len, &ret, 0))
-               throw system_error("ReadFile");
-#else
-       int ret = ::read(*handle, buf, len);
-       if(ret==-1)
-       {
-               if(errno==EAGAIN)
-                       return 0;
-               else
-                       throw system_error("read");
-       }
-       else if(ret==0)
-               eof_flag = true;
-#endif
+       unsigned ret = sys_read(handle, buf, len);
+       if(ret==0)
+               set_eof();
 
        return ret;
 }
 
-Console &Console::instance(unsigned n)
+Console &Console::instance(Stream s)
 {
-       static Console in(0);
-       static Console out(1);
-       static Console err(2);
+       static Console in(CIN);
+       static Console out(COUT);
+       static Console err(CERR);
 
-       switch(n)
+       switch(s)
        {
-       case 0: return in;
-       case 1: return out;
-       case 2: return err;
+       case CIN: return in;
+       case COUT: return out;
+       case CERR: return err;
        }
 
        throw invalid_argument("Console::instance");
 }
 
-Console &cin = Console::instance(0);
-Console &cout = Console::instance(1);
-Console &cerr = Console::instance(2);
+Console &cin = Console::instance(Console::CIN);
+Console &cout = Console::instance(Console::COUT);
+Console &cerr = Console::instance(Console::CERR);
 
 } // namespace IO
 } // namespace Msp