X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fio%2Fconsole.cpp;h=4d686db1aafb5ec33dc74ad2cd212a5a84d0c853;hb=d16185720fa344263367dbd50c61bfc8183d99a4;hp=a0e0c28f07cbbd506683cb92166f3def8b57b93a;hpb=31e72f50fbb34d86877e5110401c49ce3fefd4bb;p=libs%2Fcore.git

diff --git a/source/io/console.cpp b/source/io/console.cpp
index a0e0c28..4d686db 100644
--- 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)
-		eof_flag = true;
-#endif
+	unsigned ret = sys_read(handle, buf, len);
+	if(ret==0)
+		set_eof();
 
 	return ret;
 }