X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fconsole.cpp;h=0ac05c6b8c9fd08c0d813ed45d4435c15384b84e;hp=d50d72df89a5b8b3e353e5612feb8175703f4a93;hb=HEAD;hpb=609c9a508cfdc7b42c46c4f21d17639204165a00

diff --git a/source/io/console.cpp b/source/io/console.cpp
index d50d72d..0ac05c6 100644
--- a/source/io/console.cpp
+++ b/source/io/console.cpp
@@ -18,27 +18,40 @@ Console::Console(Stream s):
 
 void Console::set_block(bool b)
 {
+	adjust_mode(mode, M_NONBLOCK, !b);
 	sys_set_blocking(handle, b);
 }
 
-unsigned Console::do_write(const char *buf, unsigned len)
+void Console::set_inherit(bool i)
+{
+	adjust_mode(mode, M_INHERIT, i);
+	sys_set_inherit(handle, i);
+}
+
+size_t Console::do_write(const char *buf, size_t len)
 {
 	check_access(M_WRITE);
 
 	return sys_write(handle, buf, len);
 }
 
-unsigned Console::do_read(char *buf, unsigned len)
+size_t Console::do_read(char *buf, size_t len)
 {
 	check_access(M_READ);
 
-	unsigned ret = sys_read(handle, buf, len);
+	size_t ret = sys_read(handle, buf, len);
 	if(ret==0)
 		set_eof();
 
 	return ret;
 }
 
+const Handle &Console::get_handle(Mode m)
+{
+	check_access(m);
+	return handle;
+}
+
 Console &Console::instance(Stream s)
 {
 	static Console in(CIN);
@@ -55,9 +68,5 @@ Console &Console::instance(Stream s)
 	throw invalid_argument("Console::instance");
 }
 
-Console &cin = Console::instance(Console::CIN);
-Console &cout = Console::instance(Console::COUT);
-Console &cerr = Console::instance(Console::CERR);
-
 } // namespace IO
 } // namespace Msp