X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fconsole.cpp;h=442bbb0f7dc0dbcd70b1cd0da62e74f247f8c162;hp=a0e0c28f07cbbd506683cb92166f3def8b57b93a;hb=6c40658510b68788fd5ef0488b20873b6aa32938;hpb=c21ab7e49852585df01b4cc19599e25a918b581b

diff --git a/source/io/console.cpp b/source/io/console.cpp
index a0e0c28..442bbb0 100644
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -123,17 +123,7 @@ unsigned Console::do_write(const char *buf, unsigned len)
 	if(!(mode&M_WRITE))
 		throw invalid_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)
@@ -141,22 +131,9 @@ unsigned Console::do_read(char *buf, unsigned len)
 	if(!(mode&M_READ))
 		throw invalid_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;
 }