Changeset 295 for cpp/frams/virtfile/stdiofile.h

Timestamp:

01/15/15 22:43:01 (10 years ago)

Author:

Maciej Komosinski

Message:

Reorganizations and extensions of directory/file/filesystem IO classes

File:

• cpp/frams/virtfile/stdiofile.h (modified) (6 diffs)

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 +15 @@
 public:
         VirtFILE *Vfopen(const char *path, const char *mode);
-        int Vfexists(const char* path);
+        bool Vfexists(const char* path);
         VirtDIR *Vopendir(const char* path);
+        bool Vmkdir(const char* path) { return makeDirectory(path); }
+        bool Vdirexists(const char* path,bool is_writable) { return directoryExists(path,is_writable); }
 };
 
@@ -28 +26 @@
 protected:
         MFILE *file;
-        SString path;
 public:
-        StdioFILE(MFILE *f) { file = f; }
-        StdioFILE(MFILE *f, const SString& p) { file = f; path = p; }
+        StdioFILE(MFILE *f):VirtFILE("") { file = f; }
+        StdioFILE(MFILE *f, const SString& p):VirtFILE(p) { file = f; }
         static void setStdio();
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return mfread(ptr, size, nmemb, file); }
@@ -41 +38 @@
         long Vtell() { return mftell(file); }
         int Vflush() { return 0; /*NOT IMPLEMENTED!*/ }
-        const char* VgetPath() { return path; }
 
         ~StdioFILE() { if (file) mfclose(file); }
@@ -50 +46 @@
 protected:
         FILE *file;
-        SString path;
 public:
-        StdioFILE(FILE *f) { file = f; }
-        StdioFILE(FILE *f, const SString& p) { file = f; path = p; }
+        StdioFILE(FILE *f):VirtFILE("") { file = f; }
+        StdioFILE(FILE *f, const SString& p):VirtFILE(p) { file = f; }
         static void setStdio();
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return fread(ptr, size, nmemb, file); }
@@ -67 +62 @@
         void Vrewind() { rewind(file); }
         int Vflush() { return fflush(file); }
-        const char* VgetPath() { return path; }
 
         ~StdioFILE() { if (file) fclose(file); }