Implement get_handle in File and Pipe

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

diff --git a/source/io/file.cpp b/source/io/file.cpp
index a91a927fbc4ac5b5c76ba65fcaa341a8571b6e99..862b607c9d00e08db7ce4e10bc2843ba1bd473ba 100644 (file)
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -88,13 +88,10 @@ File::~File()
 {
        signal_flush_required.emit();
        sys_close(handle);
-       signal_closed.emit();
 }
 
 void File::set_block(bool b)
 {
-       check_access(M_NONE);
-
        mode = (mode&~M_NONBLOCK);
        if(b)
                mode = (mode|M_NONBLOCK);
@@ -128,10 +125,7 @@ unsigned File::do_read(char *buf, unsigned size)
 
        unsigned ret = sys_read(handle, buf, size);
        if(ret==0)
-       {
-               eof_flag = true;
-               signal_end_of_file.emit();
-       }
+               set_eof();
 
        return ret;
 }
@@ -147,8 +141,6 @@ void File::sync()
 
 SeekOffset File::seek(SeekOffset off, SeekType type)
 {
-       check_access(M_NONE);
-
        signal_flush_required.emit();
        off = sys_seek(handle, off, type);
        eof_flag = false;
@@ -158,15 +150,13 @@ SeekOffset File::seek(SeekOffset off, SeekType type)
 
 SeekOffset File::tell() const
 {
-       check_access(M_NONE);
-
        return sys_seek(const_cast<Handle &>(handle), 0, S_CUR);
 }
 
-void File::check_access(Mode m) const
+const Handle &File::get_handle(Mode m)
 {
-       if(!handle || (m && !(mode&m)))
-               throw invalid_access(m);
+       check_access(m);
+       return handle;
 }
 
 } // namespace IO