Add functions to support console redirection

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

diff --git a/source/io/console.cpp b/source/io/console.cpp
index b695e3c33a90c14bfe521b1e57ad3dc3c08390d1..259f80fbdf5ca21802099d9108c779f1bb9c0f53 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(Console::Stream stream)
+{
+       switch(stream)
+       {
+       case INPUT: return STD_INPUT_HANDLE;
+       case OUTPUT: return STD_OUTPUT_HANDLE;
+       case ERROR: 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==INPUT ? 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==INPUT)
                tcgetattr(*handle, &orig_attr);
 #endif
 
-       if(n==0)
+       if(stream==INPUT)
                set_events(P_INPUT);
 }
 
 Console::~Console()
 {
 #ifndef WIN32
-       if(handle==0)
+       if(stream==INPUT)
                tcsetattr(*handle, TCSADRAIN, &orig_attr);
 #endif
 }
@@ -88,14 +94,18 @@ void Console::set_line_buffer(bool l)
 
 #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
 }
 
@@ -109,12 +119,23 @@ 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
 }
 
+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);
@@ -128,30 +149,30 @@ unsigned Console::do_read(char *buf, unsigned len)
 
        unsigned ret = sys_read(handle, buf, len);
        if(ret==0)
-               eof_flag = true;
+               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(INPUT);
+       static Console out(OUTPUT);
+       static Console err(ERROR);
 
-       switch(n)
+       switch(s)
        {
-       case 0: return in;
-       case 1: return out;
-       case 2: return err;
+       case INPUT: return in;
+       case OUTPUT: return out;
+       case ERROR: 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::INPUT);
+Console &cout = Console::instance(Console::OUTPUT);
+Console &cerr = Console::instance(Console::ERROR);
 
 } // namespace IO
 } // namespace Msp