X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Fpipe.cpp;h=01bf20aaea32c056b33e2213dafdd1d0515c3f1e;hp=0a72a80068da4d9ac686fdb8cd3216801e316725;hb=c8bf2d6c15893ccc9dbc4e04611b7229029f4808;hpb=9a4c531eb1aa68595cd3ab074b31bfa565aaefe2

diff --git a/source/io/pipe.cpp b/source/io/pipe.cpp
index 0a72a80..01bf20a 100644
--- a/source/io/pipe.cpp
+++ b/source/io/pipe.cpp
@@ -42,15 +42,19 @@ void Pipe::set_mode(Mode m)
 
 void Pipe::set_block(bool b)
 {
-	mode = (mode&~M_NONBLOCK);
-	if(b)
-		mode = (mode|M_NONBLOCK);
-
+	adjust_mode(mode, M_NONBLOCK, !b);
 	sys_set_blocking(read_handle, b);
 	sys_set_blocking(write_handle, b);
 }
 
-unsigned Pipe::do_write(const char *buf, unsigned size)
+void Pipe::set_inherit(bool i)
+{
+	adjust_mode(mode, M_INHERIT, i);
+	sys_set_inherit(read_handle, i);
+	sys_set_inherit(write_handle, i);
+}
+
+size_t Pipe::do_write(const char *buf, size_t size)
 {
 	if(size==0)
 		return 0;
@@ -58,12 +62,12 @@ unsigned Pipe::do_write(const char *buf, unsigned size)
 	return sys_write(write_handle, buf, size);
 }
 
-unsigned Pipe::do_read(char *buf, unsigned size)
+size_t Pipe::do_read(char *buf, size_t size)
 {
 	if(size==0)
 		return 0;
 
-	unsigned ret = reader.read(buf, size);
+	size_t ret = reader.read(buf, size);
 	if(ret==0)
 		set_eof();