Put the check_access function in Base

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

diff --git a/source/io/console.cpp b/source/io/console.cpp
index a0e0c28f07cbbd506683cb92166f3def8b57b93a..b695e3c33a90c14bfe521b1e57ad3dc3c08390d1 100644 (file)
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -68,8 +68,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,8 +84,7 @@ 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;
@@ -103,8 +101,7 @@ void Console::set_line_buffer(bool l)
 
 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
@@ -120,43 +117,18 @@ void Console::get_size(unsigned &rows, unsigned &cols)
 
 unsigned Console::do_write(const char *buf, unsigned len)
 {
-       if(!(mode&M_WRITE))
-               throw invalid_access(M_WRITE);
+       check_access(M_WRITE);
 
-#ifdef WIN32
-       DWORD ret;
-       if(!WriteFile(*handle, buf, len, &ret, 0))
-               throw system_error("WriteFile");
-#else
-       int ret = ::write(*handle, buf, len);
-       if(ret==-1)
-               throw system_error("write");
-#endif
-
-       return ret;
+       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)
+       unsigned ret = sys_read(handle, buf, len);
+       if(ret==0)
                eof_flag = true;
-#endif
 
        return ret;
 }