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

diff --git a/source/io/file.h b/source/io/file.h
index d106561..292897b 100644
--- a/source/io/file.h
+++ b/source/io/file.h
@@ -4,7 +4,6 @@
 #include <stdexcept>
 #include <string>
 #include "buffered.h"
-#include "filtered.h"
 #include "handle.h"
 #include "seekable.h"
 
@@ -15,14 +14,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() { }
+	virtual ~file_not_found() throw() = default;
 };
 
 class file_already_exists: public std::runtime_error
 {
 public:
 	file_already_exists(const std::string &fn): std::runtime_error(fn) { }
-	~file_already_exists() throw() { }
+	virtual ~file_already_exists() throw() = default;
 };
 
 
@@ -57,11 +56,12 @@ private:
 public:
 	virtual ~File();
 
-	void set_block(bool);
+	virtual void set_block(bool);
+	virtual void set_inherit(bool);
 
 protected:
-	virtual unsigned do_write(const char *, unsigned);
-	virtual unsigned do_read(char *, unsigned);
+	virtual std::size_t do_write(const char *, std::size_t);
+	virtual std::size_t do_read(char *, std::size_t);
 
 public:
 	virtual void sync();
@@ -81,7 +81,34 @@ 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);
+	virtual void set_inherit(bool);
+
+protected:
+	virtual std::size_t do_write(const char *, std::size_t);
+	virtual std::size_t do_read(char *, std::size_t);
+public:
+	virtual std::size_t 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