Changeset 206

Timestamp:

04/03/14 01:24:30 (11 years ago)

Author:

Maciej Komosinski

Message:

VirtFILE base class provides Vprintf, Vgetc, Vputc, Vrewind, so that subclasses do not have to implement these functions

Location:

cpp/frams/virtfile

Files:

• stdiofile.cpp (modified) (1 diff)
• stdiofile.h (modified) (4 diffs)
• virtfile.cpp (modified) (2 diffs)
• virtfile.h (modified) (1 diff)

cpp/frams/virtfile/stdiofile.cpp

@@ -11 +11 @@
 {
         //printFM("Vfopen %s %s",path,mode);
+#ifdef USE_MFILE
+        MFILE *f=mfopen(path,mode);
+#else
         FILE *f=fopen(path,mode);
+#endif
         //printFM("%p",f);
         if (f) return new StdioFILE(f,path); else return 0;

cpp/frams/virtfile/stdiofile.h

@@ -8 +8 @@
 #include "virtfile.h"
 #include <frams/util/sstring.h>
+#ifdef USE_MFILE
+#include <common/nonstd_stdio.h>
+#else
 #include <stdio.h>
+#endif
 #include <common/nonstd_dir.h>
 
@@ -19 +23 @@
 };
 
+#ifdef USE_MFILE
+class StdioFILE: public VirtFILE
+{
+  protected:
+MFILE *file;
+SString path;
+  public:
+StdioFILE(MFILE *f) {file=f;}
+StdioFILE(MFILE *f,const SString& p) {file=f;path=p;}
+static void setStdio();
+int Vread(void *ptr, size_t size, size_t nmemb) {return mfread(ptr,size,nmemb,file);}
+int Vwrite(const void *ptr, size_t size, size_t nmemb) {return mfwrite(ptr,size,nmemb,file);}
+int Veof() {return mfeof(file);}
+int Vputs(const char *s) {return mfputs(s,file);}
+char *Vgets(char *s, int size) {return mfgets(s,size,file);}
+int Vseek(long offset, int whence) {return mfseek(file,offset,whence);}
+int Vtell() {return mftell(file);}
+int Vflush() {return 0;/*NOT IMPLEMENTED!*/;}
+const char* VgetPath() {return path;}
+
+~StdioFILE() {if (file) fclose(file);}
+};
+#else
 class StdioFILE: public VirtFILE
 {
@@ -44 +71 @@
 ~StdioFILE() {if (file) fclose(file);}
 };
+#endif
 
 class StdioDIR: public VirtDIR
@@ -57 +85 @@
 {
   public:
+#ifdef USE_MFILE
+StdioFILEDontClose(MFILE *f):StdioFILE(f) {}
+#else
 StdioFILEDontClose(FILE *f):StdioFILE(f) {}
+#endif
 ~StdioFILEDontClose() {file=0;}
 };

cpp/frams/virtfile/virtfile.cpp

@@ -4 +4 @@
 
 #include "virtfile.h"
+#include <common/stl-util.h>
 
 VirtFILE *VirtFILE::Vstdin=0;
@@ -30 +31 @@
 
 void VirtFILE::selectFileSystem(VirtFileSystem *s) {vfs=s;}
+
+int VirtFILE::Vprintf(const char *format, va_list args)
+{
+string s=ssprintf_va(format,args);
+return Vwrite(s.c_str(),1,s.size());
+}
 
 int VirtFILE::printf(const char *format, ...)

cpp/frams/virtfile/virtfile.h

@@ -26 +26 @@
 virtual int Vwrite(const void *ptr, size_t size, size_t nmemb)=0;
 virtual int Veof()=0;
-virtual int Vputc(int c)=0;
+virtual int Vputc(int c) {unsigned char data=c; return (Vwrite(&data,1,1)==1)?data:EOF;}
 virtual int Vputs(const char *s)=0;
-virtual int Vgetc()=0;
+virtual int Vgetc() {unsigned char data; if (Vread(&data,1,1)==1) return data; else return EOF;}
 virtual int Vseek(long offset, int whence)=0;
 virtual int Vtell()=0;
-virtual void Vrewind()=0;
+virtual void Vrewind() {Vseek(0,SEEK_SET);}
 virtual int Vflush()=0;
 virtual char *Vgets(char *s, int size)=0;
-virtual int Vprintf(const char *format, va_list args)=0;
+virtual int Vprintf(const char *format, va_list args);
 int printf(const char *format, ...);
 virtual const char *VgetPath() {return 0;} // 0=unspecified path