2 files changed, 26 insertions, 39 deletions

diff --git a/src/old/sfile.h b/src/old/sfile.h
deleted file mode 100644
index b51e5bc..0000000
--- a/src/old/sfile.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SFILE_H
-#define SFILE_H
-
-#include <stdint.h>
-
-#include "stream.h"
-
-class SFile : public Stream
-{
-public:
-        SFile( const char *sName, const char *sFlags );
-        virtual ~SFile();
-
-        virtual void close();
-        virtual size_t read( char *pBuf, size_t nBytes );
-        virtual size_t write( const char *pBuf, size_t nBytes );
-
-        virtual long tell();
-        virtual void seek( long offset );
-        virtual void setPos( long pos );
-        virtual void setPosEnd( long pos );
-        virtual bool isEOS();
-
-private:
-        FILE *fh;
-
-};
-
-#endif
diff --git a/src/old/sfile.cpp b/src/sfile.cpp
index f1de03c..d7c5c83 100644
--- a/src/old/sfile.cpp
+++ b/src/sfile.cpp
@@ -1,16 +1,17 @@
 #include "sfile.h"
 #include "exceptions.h"
 
-SFile::SFile( const char *sName, const char *sFlags )
+Bu::SFile::SFile( const char *sName, const char *sFlags )
 {
         fh = fopen( sName, sFlags );
 }
 
-SFile::~SFile()
+Bu::SFile::~SFile()
 {
+        close();
 }
 
-void SFile::close()
+void Bu::SFile::close()
 {
         if( fh )
         {
@@ -19,7 +20,7 @@ void SFile::close()
         }
 }
 
-size_t SFile::read( char *pBuf, size_t nBytes )
+size_t Bu::SFile::read( char *pBuf, size_t nBytes )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -27,7 +28,7 @@ size_t SFile::read( char *pBuf, size_t nBytes )
         return fread( pBuf, 1, nBytes, fh );
 }
 
-size_t SFile::write( const char *pBuf, size_t nBytes )
+size_t Bu::SFile::write( const char *pBuf, size_t nBytes )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -35,7 +36,7 @@ size_t SFile::write( const char *pBuf, size_t nBytes )
         return fwrite( pBuf, 1, nBytes, fh );
 }
 
-long SFile::tell()
+long Bu::SFile::tell()
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -43,7 +44,7 @@ long SFile::tell()
         return ftell( fh );
 }
 
-void SFile::seek( long offset )
+void Bu::SFile::seek( long offset )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -51,7 +52,7 @@ void SFile::seek( long offset )
         fseek( fh, offset, SEEK_CUR );
 }
 
-void SFile::setPos( long pos )
+void Bu::SFile::setPos( long pos )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -59,7 +60,7 @@ void SFile::setPos( long pos )
         fseek( fh, pos, SEEK_SET );
 }
 
-void SFile::setPosEnd( long pos )
+void Bu::SFile::setPosEnd( long pos )
 {
         if( !fh )
                 throw FileException("File not open.");
@@ -67,8 +68,23 @@ void SFile::setPosEnd( long pos )
         fseek( fh, pos, SEEK_END );
 }
 
-bool SFile::isEOS()
+bool Bu::SFile::isEOS()
 {
         return feof( fh );
 }
 
+bool Bu::SFile::canRead()
+{
+        return true;
+}
+
+bool Bu::SFile::canWrite()
+{
+        return true;
+}
+
+bool Bu::SFile::canSeek()
+{
+        return true;
+}
+