Merge branch 'master' into stable

1 files changed, 34 insertions, 1 deletions

diff --git a/src/utils/files.cpp b/src/utils/files.cpp
index 206a4d4bd..24ec9366e 100644
--- a/src/utils/files.cpp
+++ b/src/utils/files.cpp
@@ -22,10 +22,10 @@
 
 #if defined(ANDROID) || defined(__native_client__)
 #include "resources/resourcemanager.h"
-#include "utils/physfstools.h"
 #endif
 
 #include "utils/mkdir.h"
+#include "utils/physfstools.h"
 
 #include "localconsts.h"
 
@@ -196,3 +196,36 @@ int Files::copyFile(const std::string &restrict srcName,
     fclose(dstFile);
     return 0;
 }
+
+void Files::getFiles(const std::string &path, StringVect &list)
+{
+    char **fonts = PhysFs::enumerateFiles(path.c_str());
+    for (char *const *i = fonts; *i; i++)
+    {
+        if (!PhysFs::isDirectory((path + *i).c_str()))
+            list.push_back(*i);
+    }
+    PhysFs::freeList(fonts);
+}
+
+void Files::getDirs(const std::string &path, StringVect &list)
+{
+    char **fonts = PhysFs::enumerateFiles(path.c_str());
+    for (char *const *i = fonts; *i; i++)
+    {
+        if (PhysFs::isDirectory((path + *i).c_str()))
+            list.push_back(*i);
+    }
+    PhysFs::freeList(fonts);
+}
+
+void Files::getFilesWithDir(const std::string &path, StringVect &list)
+{
+    char **fonts = PhysFs::enumerateFiles(path.c_str());
+    for (char *const *i = fonts; *i; i++)
+    {
+        if (!PhysFs::isDirectory((path + *i).c_str()))
+            list.push_back(path + *i);
+    }
+    PhysFs::freeList(fonts);
+}