X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fio%2Ffile.h;h=ececa8dc19c28f53d2e690db06af481a81555e52;hp=ed0a3f8336ac42ff0237e2cfcb4e95d2f7b97d07;hb=481b844ed7d180ffbf70223075f2fc1ffdb5b444;hpb=c21ab7e49852585df01b4cc19599e25a918b581b

diff --git a/source/io/file.h b/source/io/file.h
index ed0a3f8..ececa8d 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -15,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() { }
 };
 
 
@@ -30,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:
@@ -40,14 +51,13 @@ 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);
+	virtual void set_block(bool);
 
 protected:
 	virtual unsigned do_write(const char *, unsigned);
@@ -56,11 +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;
 
-private:
-	void check_access(Mode) const;
+	virtual const Handle &get_handle(Mode);
 };
 
 inline File::CreateMode operator|(File::CreateMode m, File::CreateMode n)
@@ -72,7 +81,33 @@ inline File::CreateMode operator&(File::CreateMode m, File::CreateMode n)
 inline File::CreateMode operator~(File::CreateMode m)
 { return File::CreateMode(~static_cast<int>(m)); }
 
-typedef Filtered<File, Buffered> BufferedFile;
+
+class BufferedFile: public Seekable
+{
+private:
+	File file;
+	Buffered buffer;
+	SeekOffset position;
+
+public:
+	BufferedFile(const std::string &, Mode = M_READ, File::CreateMode = File::C_OVERWRITE);
+
+	virtual void set_block(bool);
+
+protected:
+	virtual unsigned do_write(const char *, unsigned);
+	virtual unsigned do_read(char *, unsigned);
+public:
+	virtual unsigned put(char);
+
+	virtual bool getline(std::string &);
+	virtual int get();
+
+	virtual const Handle &get_handle(Mode);
+
+	virtual SeekOffset seek(SeekOffset, SeekType);
+	virtual SeekOffset tell() const { return position; }
+};
 
 } // namespace IO
 } // namespace Msp