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

diff --git a/source/io/file.cpp b/source/io/file.cpp
index 1b207a2..666b1ed 100644
--- a/source/io/file.cpp
+++ b/source/io/file.cpp
@@ -1,10 +1,3 @@
-#ifndef WIN32
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#endif
-#include <msp/strings/format.h>
-#include <msp/core/systemerror.h>
 #include "file.h"
 #include "handle_private.h"
 
@@ -17,102 +10,26 @@ File::File(const string &fn, Mode m, CreateMode cm)
 {
 	if(!(m&M_RDWR))
 		throw invalid_argument("File::File mode");
-	if(cm&~(C_CREATE|C_TRUNCATE))
+	if(cm&~(C_CREATE|C_TRUNCATE|C_EXCLUSIVE))
+		throw invalid_argument("File::File create");
+	if((cm&C_EXCLUSIVE) && (!(cm&C_CREATE) || (cm&C_TRUNCATE)))
 		throw invalid_argument("File::File create");
 
 	mode = m;
 
-#ifdef WIN32
-	int flags = 0;
-	int create_flags = OPEN_EXISTING;
-
-	if(mode&M_READ)
-		flags |= GENERIC_READ;
-	else if(mode&M_WRITE)
-	{
-		flags |= GENERIC_WRITE;
-
-		switch(static_cast<int>(cm))
-		{
-		case C_NONE:     create_flags = OPEN_EXISTING; break;
-		case C_CREATE:   create_flags = OPEN_ALWAYS; break;
-		case C_TRUNCATE: create_flags = TRUNCATE_EXISTING; break;
-		case C_CREATE+C_TRUNCATE: create_flags = CREATE_ALWAYS; break;
-		}
-	}
-
-	*handle = CreateFile(fn.c_str(), flags, 0, 0, create_flags, FILE_ATTRIBUTE_NORMAL, 0);
-	if(!handle)
-	{
-		int err = GetLastError();
-		if(err==ERROR_FILE_NOT_FOUND)
-			throw file_not_found(fn);
-		else
-			throw system_error(format("CreateFile(%s)", fn), err);
-	}
-#else
-	int flags = 0;
-	switch(mode&M_RDWR)
-	{
-	case M_READ:  flags |= O_RDONLY; break;
-	case M_WRITE: flags |= O_WRONLY; break;
-	case M_RDWR:  flags |= O_RDWR; break;
-	default:;
-	}
-
-	if(mode&M_WRITE)
-	{
-		if(cm&C_CREATE)
-			flags |= O_CREAT;
-		if(cm&C_TRUNCATE)
-			flags |= O_TRUNC;
-	}
-	if(mode&M_APPEND)
-		flags |= O_APPEND;
-	if(mode&M_NONBLOCK)
-		flags |= O_NONBLOCK;
-
-	*handle = ::open(fn.c_str(), flags, 0666);
-	if(!handle)
-	{
-		int err = errno;
-		if(err==ENOENT)
-			throw file_not_found(fn);
-		else
-			throw system_error(format("open(%s)", fn), err);
-	}
-#endif
+	platform_init(fn, 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);
-#ifndef WIN32
-	int flags = fcntl(*handle, F_GETFD);
-	fcntl(*handle, F_SETFL, (flags&O_NONBLOCK)|(b?0:O_NONBLOCK));
-#endif
+	mode = b?(mode&~M_NONBLOCK):(mode|M_NONBLOCK);
+	sys_set_blocking(handle, b);
 }
 
 unsigned File::do_write(const char *buf, unsigned size)
@@ -139,66 +56,90 @@ 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;
 }
 
-void File::sync()
+SeekOffset File::seek(SeekOffset off, SeekType type)
 {
-#ifndef WIN32
 	signal_flush_required.emit();
+	off = sys_seek(handle, off, type);
+	eof_flag = false;
 
-	fsync(*handle);
-#endif
+	return off;
 }
 
-unsigned File::seek(int off, SeekType st)
+SeekOffset File::tell() const
 {
-	check_access(M_NONE);
+	return sys_seek(const_cast<Handle &>(handle), 0, S_CUR);
+}
 
-	signal_flush_required.emit();
+const Handle &File::get_handle(Mode m)
+{
+	check_access(m);
+	return handle;
+}
 
-	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
 
-	eof_flag = false;
+BufferedFile::BufferedFile(const string &fn, Mode m, File::CreateMode cm):
+	file(fn, m, cm),
+	buffer(file),
+	position(0)
+{
+	mode = m;
+	file.signal_end_of_file.connect(sigc::mem_fun(this, &BufferedFile::set_eof));
+}
 
+unsigned BufferedFile::do_write(const char *buf, unsigned size)
+{
+	unsigned ret = buffer.write(buf, size);
+	position += ret;
 	return ret;
 }
 
-unsigned File::tell() const
+unsigned BufferedFile::do_read(char *buf, unsigned size)
 {
-	check_access(M_NONE);
+	unsigned ret = buffer.read(buf, size);
+	position += ret;
+	return ret;
+}
 
-#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
+unsigned BufferedFile::put(char c)
+{
+	unsigned ret = buffer.put(c);
+	position += ret;
+	return ret;
+}
+
+bool BufferedFile::getline(string &line)
+{
+	bool ret = buffer.getline(line);
+	if(ret)
+		position += line.size();
+	return ret;
+}
 
+int BufferedFile::get()
+{
+	int ret = buffer.get();
+	if(ret>=0)
+		++position;
 	return ret;
 }
 
-void File::check_access(Mode m) const
+SeekOffset BufferedFile::seek(SeekOffset offset, SeekType type)
 {
-	if(!handle || (m && !(mode&m)))
-		throw invalid_access(m);
+	if(type==S_CUR)
+	{
+		offset += position;
+		type = S_BEG;
+	}
+
+	signal_flush_required.emit();
+	position = file.seek(offset, type);
+	eof_flag = false;
+	return position;
 }
 
 } // namespace IO