Merge remote-tracking branch 'secondlife/release/26.4' into 26.4

1 files changed, 25 insertions, 42 deletions

diff --git a/indra/llfilesystem/lldir.cpp b/indra/llfilesystem/lldir.cpp
index a57ac021d9..72f74e1e97 100644
--- a/indra/llfilesystem/lldir.cpp
+++ b/indra/llfilesystem/lldir.cpp
@@ -30,8 +30,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <errno.h>
-#else
-#include <direct.h>
 #endif
 
 #include "lldir.h"
@@ -43,7 +41,6 @@
 #include "lldiriterator.h"
 #include "stringize.h"
 #include "llstring.h"
-#include <boost/filesystem.hpp>
 #include "llprocess.h"
 #include <boost/bind.hpp>
 #include <algorithm>
@@ -94,34 +91,20 @@ LLDir::~LLDir()
 
 std::vector<std::string> LLDir::getFilesInDir(const std::string &dirname)
 {
-    //Returns a vector of fullpath filenames.
-
-#ifdef LL_WINDOWS // or BOOST_WINDOWS_API
-    boost::filesystem::path p(ll_convert<std::wstring>(dirname));
-#else
-    boost::filesystem::path p(dirname);
-#endif
-
+    // Returns a vector of filenames in the directory.
+    fsyspath dir_path(dirname);
     std::vector<std::string> v;
-
-    boost::system::error_code ec;
-    if (exists(p, ec) && !ec.failed())
+    std::error_code ec;
+    if (std::filesystem::is_directory(dir_path, ec))
     {
-        if (is_directory(p, ec) && !ec.failed())
+        std::filesystem::directory_iterator end_iter;
+        for (std::filesystem::directory_iterator dir_itr(dir_path);
+             dir_itr != end_iter;
+             ++dir_itr)
         {
-            boost::filesystem::directory_iterator end_iter;
-            for (boost::filesystem::directory_iterator dir_itr(p);
-                 dir_itr != end_iter;
-                 ++dir_itr)
+            if (std::filesystem::is_regular_file(dir_itr->status()))
             {
-                if (boost::filesystem::is_regular_file(dir_itr->status()))
-                {
-#if LL_WINDOWS
-                    v.push_back(utf16str_to_utf8str(dir_itr->path().filename().wstring()));
-#else
-                    v.push_back(dir_itr->path().filename().string());
-#endif
-                }
+                v.push_back(dir_itr->path().filename().string());
             }
         }
     }
@@ -194,31 +177,31 @@ U32 LLDir::deleteDirAndContents(const std::string& dir_name)
 
     try
     {
-#ifdef LL_WINDOWS // or BOOST_WINDOWS_API
-        boost::filesystem::path dir_path(ll_convert<std::wstring>(dir_name));
-#else
-        boost::filesystem::path dir_path(dir_name);
-#endif
-
-       if (boost::filesystem::exists(dir_path))
+       fsyspath dir_path(dir_name);
+       if (std::filesystem::is_directory(dir_path))
        {
-          if (!boost::filesystem::is_empty(dir_path))
+          if (!std::filesystem::is_empty(dir_path))
           {   // Directory has content
-             num_deleted = (U32)boost::filesystem::remove_all(dir_path);
+             num_deleted = (U32)std::filesystem::remove_all(dir_path);
           }
           else
           {   // Directory is empty
-             boost::filesystem::remove(dir_path);
+             std::filesystem::remove(dir_path);
           }
        }
     }
-    catch (boost::filesystem::filesystem_error &er)
+    catch (std::filesystem::filesystem_error &er)
     {
         LL_WARNS() << "Failed to delete " << dir_name << " with error " << er.code().message() << LL_ENDL;
     }
     return num_deleted;
 }
 
+bool LLDir::fileExists(const std::string& filename) const
+{
+    return LLFile::exists(filename);
+}
+
 const std::string LLDir::findFile(const std::string &filename,
                            const std::string& searchPath1,
                            const std::string& searchPath2,
@@ -1028,7 +1011,7 @@ bool LLDir::setCacheDir(const std::string &path)
     {
         LLFile::mkdir(path);
         std::string tempname = add(path, "temp");
-        LLFILE* file = LLFile::fopen(tempname,"wt");
+        LLFILE* file = LLFile::fopen(tempname, LLFILE_MODE("wt"));
         if (file)
         {
             fclose(file);
@@ -1168,15 +1151,15 @@ void dir_exists_or_crash(const std::string &dir_name)
 #if LL_WINDOWS
     // *FIX: lame - it doesn't do the same thing on windows. not so
     // important since we don't deploy simulator to windows boxes.
-    LLFile::mkdir(dir_name, 0700);
+    LLFile::mkdir(dir_name);
 #else
-    struct stat dir_stat;
+    llstat dir_stat;
     if(0 != LLFile::stat(dir_name, &dir_stat))
     {
         S32 stat_rv = errno;
         if(ENOENT == stat_rv)
         {
-           if(0 != LLFile::mkdir(dir_name, 0700))       // octal
+           if(0 != LLFile::mkdir(dir_name))
            {
                LL_ERRS() << "Unable to create directory: " << dir_name << LL_ENDL;
            }