X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=d106561e5f599cc31367be5f3de9140a4d349cbf;hp=d59cd577fc0f33e1acbcbb62bcaa9fa0bb31c141;hb=609c9a508cfdc7b42c46c4f21d17639204165a00;hpb=86e0004bd195bc7f7478cf736871339bddf38127

diff --git a/source/io/file.h b/source/io/file.h
index d59cd57..d106561 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -5,6 +5,7 @@
 #include <string>
 #include "buffered.h"
 #include "filtered.h"
+#include "handle.h"
 #include "seekable.h"
 
 namespace Msp {
@@ -14,6 +15,14 @@ class file_not_found: public std::runtime_error
 {
 public:
 	file_not_found(const std::string &fn): std::runtime_error(fn) { }
+	~file_not_found() throw() { }
+};
+
+class file_already_exists: public std::runtime_error
+{
+public:
+	file_already_exists(const std::string &fn): std::runtime_error(fn) { }
+	~file_already_exists() throw() { }
 };
 
 
@@ -29,7 +38,10 @@ public:
 	{
 		C_NONE = 0,
 		C_CREATE = 1,
-		C_TRUNCATE = 2
+		C_TRUNCATE = 2,
+		C_OVERWRITE = C_CREATE+C_TRUNCATE,
+		C_EXCLUSIVE = 4,
+		C_NEW = C_CREATE+C_EXCLUSIVE
 	};
 
 private:
@@ -39,13 +51,12 @@ public:
 	/** Creates a new file object and opens it.  If the create flag is set and
 	write access is requested and the file does exist, it is created.  Otherwise
 	a missing file is an error. */
-	File(const std::string &, Mode = M_READ, CreateMode = CreateMode(C_CREATE+C_TRUNCATE));
+	File(const std::string &, Mode = M_READ, CreateMode = C_OVERWRITE);
+private:
+	void platform_init(const std::string &, CreateMode);
+public:
 	virtual ~File();
 
-	/** Closes the file.  Any attempt to access the file after this will cause
-	an exception to be thrown. */
-	void close();
-
 	void set_block(bool);
 
 protected:
@@ -55,13 +66,10 @@ protected:
 public:
 	virtual void sync();
 
-	virtual unsigned seek(int, SeekType);
-	virtual unsigned tell() const;
+	virtual SeekOffset seek(SeekOffset, SeekType);
+	virtual SeekOffset tell() const;
 
-	virtual Handle get_event_handle() { return handle; }
-
-private:
-	void check_access(Mode) const;
+	virtual const Handle &get_handle(Mode);
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)