Changeset 427 for cpp/common

Timestamp:

08/27/15 00:07:42 (9 years ago)

Author:

Maciej Komosinski

Message:

Android can read files again after a slash has been removed from the path

Location:

cpp/common

Files:

• nonstd_stdio.cpp (modified) (3 diffs)
• virtfile/virtfile.h (modified) (1 diff)

cpp/common/nonstd_stdio.cpp

@@ -243 +243 @@
 #ifdef __ANDROID__
 #include "log.h"
-#include "nonstd.h"
+#include "dirs.h"
 #include "nonstd_stl.h"
 MFILE *mfopen(const char *path, const char *mode)
@@ -250 +250 @@
         //log_printf("Opening '%s', mode='%s'",path,mode);
         //log_printf("getAppResourcesDir()='%s'",respath.c_str());
+        //log_printf("getAppWritableDir()='%s'",getAppWritableDir().c_str());
         NvFile *rfile=NULL; //can only read
         FILE *rwfile=NULL;
@@ -255 +256 @@
         {
                 path+=respath.length(); //strip the prefix, we need a relative path in assets
+                if (path[0]=='/') path++; //also strip slash if it was there (the prefix has no trailing slash so it doesn't get stipped above)
                 if (strstr(mode,"w"))
                         log_printf("Warning: attempt to open a read-only resource '%s' in writable mode '%s'",path,mode);

cpp/common/virtfile/virtfile.h

@@ -86 +86 @@
 public:
         virtual ~VirtDIR() {}
-        virtual dirent* Vreaddir() { return 0; }
+        virtual dirent* Vreaddir() { return NULL; }
 };