X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.cpp;h=862b607c9d00e08db7ce4e10bc2843ba1bd473ba;hp=1b207a25971f960ef99fa5f4481a0be23239e38d;hb=f041a31f9a6e19da86a63912e5a8050f216e5bc5;hpb=6c40658510b68788fd5ef0488b20873b6aa32938

diff --git a/source/io/file.cpp b/source/io/file.cpp
index 1b207a2..862b607 100644
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -86,26 +86,12 @@ File::File(const string &fn, Mode m, CreateMode cm)
 
 File::~File()
 {
-	close();
-}
-
-void File::close()
-{
-	if(!handle)
-		return;
-
 	signal_flush_required.emit();
-
 	sys_close(handle);
-
-	handle = Handle();
-	signal_closed.emit();
 }
 
 void File::set_block(bool b)
 {
-	check_access(M_NONE);
-
 	mode = (mode&~M_NONBLOCK);
 	if(b)
 		mode = (mode|M_NONBLOCK);
@@ -139,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;
 }
@@ -156,49 +139,24 @@ void File::sync()
 #endif
 }
 
-unsigned File::seek(int off, SeekType st)
+SeekOffset File::seek(SeekOffset off, SeekType type)
 {
-	check_access(M_NONE);
-
 	signal_flush_required.emit();
-
-	int type = sys_seek_type(st);
-#ifdef WIN32
-	DWORD ret = SetFilePointer(*handle, off, 0, type);
-	if(ret==INVALID_SET_FILE_POINTER)
-		throw system_error("SetFilePointer");
-#else
-	off_t ret = lseek(*handle, off, type);
-	if(ret==(off_t)-1)
-		throw system_error("lseek");
-#endif
-
+	off = sys_seek(handle, off, type);
 	eof_flag = false;
 
-	return ret;
+	return off;
 }
 
-unsigned File::tell() const
+SeekOffset File::tell() const
 {
-	check_access(M_NONE);
-
-#ifdef WIN32
-	DWORD ret = SetFilePointer(*handle, 0, 0, FILE_CURRENT);
-	if(ret==INVALID_SET_FILE_POINTER)
-		throw system_error("SetFilePointer");
-#else
-	off_t ret = lseek(*handle, 0, SEEK_CUR);
-	if(ret==(off_t)-1)
-		throw system_error("lseek");
-#endif
-
-	return ret;
+	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