Changeset 425 for cpp/common

Timestamp:

08/27/15 00:05:32 (9 years ago)

Author:

Maciej Komosinski

Message:

The NO_STD_IN_OUT_ERR macro excludes entire functions, not their contents

Location:

cpp/common/virtfile

Files:

• stdiofile.cpp (modified) (4 diffs)
• stdiofile.h (modified) (2 diffs)

cpp/common/virtfile/stdiofile.cpp

@@ -8 +8 @@
 #include <common/log.h>
 #include <common/Convert.h>
+#ifdef __ANDROID__
+#include <common/dirs.h>
+#include <common/platform/android/AndroidAPK_DIR.h>
+#endif
 
 VirtFILE* StdioFileSystem::Vfopen(const char *path, const char *mode)
@@ -24 +28 @@
 {
         //log_printf("Vopendir %s",path);
+#ifdef __ANDROID__
+        int resources_prefix_length=getAppResourcesDir().length();
+        if (strncmp(path, getAppResourcesDir().c_str(), resources_prefix_length) == 0) //it is a resources dir
+        {
+                VirtDIR *vd = AndroidAPK_DIR::opendir(path+resources_prefix_length+1); //+1 because we also skip '/' and start with a "relative" dir, otherwise it does not work.
+                return vd;
+        }
+#endif
+
 #ifdef _WIN32
         DIRTYPE *d = wopendir(Convert::utf8ToUtf16(path).c_str());
@@ -38 +51 @@
 }
 
+#ifndef NO_STD_IN_OUT_ERR
 void StdioFILE::setStdio()
 {
-#ifndef NO_STD_IN_OUT_ERR
         static StdioFILEDontClose si(stdin);
         static StdioFILEDontClose so(stdout);
@@ -47 +60 @@
         setVstdout(&so);
         setVstderr(&se);
+}
 #endif
-}
 
 dirent* StdioDIR::Vreaddir()

cpp/common/virtfile/stdiofile.h

@@ -28 +28 @@
         StdioFILE(MFILE *f):VirtFILE("") { file = f; }
         StdioFILE(MFILE *f, const char* p):VirtFILE(p) { file = f; }
+#ifndef NO_STD_IN_OUT_ERR
         static void setStdio();
+#endif
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return mfread(ptr, size, nmemb, file); }
         size_t Vwrite(const void *ptr, size_t size, size_t nmemb) { return mfwrite(ptr, size, nmemb, file); }
@@ -48 +50 @@
         StdioFILE(FILE *f):VirtFILE("") { file = f; }
         StdioFILE(FILE *f, const char* p):VirtFILE(p) { file = f; }
+#ifndef NO_STD_IN_OUT_ERR
         static void setStdio();
+#endif
         size_t Vread(void *ptr, size_t size, size_t nmemb) { return fread(ptr, size, nmemb, file); }
         size_t Vwrite(const void *ptr, size_t size, size_t nmemb) { return fwrite(ptr, size, nmemb, file); }