Switch to utf8 filesystem handling using boost::nowide.

egorpugin · egorpugin · commit 9dc7bc23e130 · 2017-07-13T02:19:15.000+03:00
diff --git a/src/bazel/test/test.cpp b/src/bazel/test/test.cpp
@@ -9,7 +9,7 @@ int main(int argc, char *argv[])
 		return 1;
 
 	std::string f, s;
-	std::ifstream ifile(argv[1]);
+    std::ifstream ifile(argv[1]);
 	while (std::getline(ifile, s))
 		f += s + "\n";
 
diff --git a/src/client/fix_imports.cpp b/src/client/fix_imports.cpp
@@ -23,6 +23,7 @@
 #include <printers/cmake.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/nowide/fstream.hpp>
 
 #include <deque>
 #include <iostream>
@@ -58,7 +59,7 @@ void fix_imports(const String &target, const path &aliases_file, const path &old
 
     if (!new_file.parent_path().empty())
         fs::create_directories(new_file.parent_path());
-    std::ofstream ofile(new_file.string());
+    boost::nowide::ofstream ofile(new_file.string());
     if (!ofile)
         throw std::runtime_error("Cannot open the output file for writing");
 
diff --git a/src/client/main.cpp b/src/client/main.cpp
@@ -65,6 +65,10 @@ void command_init(const Strings &args);
 int main(int argc, char *argv[])
 try
 {
+    // library initializations
+    setup_utf8_filesystem();
+
+    //
     Strings args;
     for (auto i = 0; i < argc; i++)
         args.push_back(argv[i]);
diff --git a/src/common/database.cpp b/src/common/database.cpp
@@ -34,6 +34,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/nowide/fstream.hpp>
 #include <sqlite3.h>
 
 #include <primitives/log.h>
@@ -1009,7 +1010,7 @@ void PackagesDatabase::load(bool drop)
             throw std::runtime_error(sqlite3_errmsg(mdb));
 
         auto fn = db_repo_dir / (td.name + ".csv");
-        std::ifstream ifile(fn.string());
+        boost::nowide::ifstream ifile(fn.string());
         if (!ifile)
             throw std::runtime_error("Cannot open file " + fn.string() + " for reading");
 
diff --git a/src/common/package.cpp b/src/common/package.cpp
@@ -23,8 +23,8 @@
 #include "lock.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/nowide/fstream.hpp>
 
-#include <iostream>
 #include <regex>
 
 #include <primitives/log.h>
@@ -57,7 +57,7 @@ path Package::getStampFilename() const
 String Package::getStampHash() const
 {
     String hash;
-    std::ifstream ifile(getStampFilename().string());
+    boost::nowide::ifstream ifile(getStampFilename().string());
     if (ifile)
         ifile >> hash;
     return hash;
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -26,6 +26,7 @@
 #include <exceptions.h>
 
 #include <boost/algorithm/string.hpp>
+#include <boost/nowide/fstream.hpp>
 
 #include <primitives/command.h>
 #include <primitives/pack.h>
@@ -189,7 +190,7 @@ void check_file_types(const Files &files)
         throw std::runtime_error("Project sources did not pass file checks:\n" + errors);
 
     auto fn = get_temp_filename();
-    std::ofstream o(fn.string(), std::ios::binary | std::ios::out);
+    boost::nowide::ofstream o(fn.string(), std::ios::binary | std::ios::out);
     if (!o)
         throw std::runtime_error("Cannot open file for writing: " + fn.string());
     for (auto &file : files)
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -26,6 +26,7 @@
 #include "stamp.h"
 
 #include <boost/algorithm/string.hpp>
+#include <boost/nowide/fstream.hpp>
 
 #include <primitives/hasher.h>
 #include <primitives/templates.h>
@@ -504,7 +505,7 @@ void Settings::clear_local_settings()
 
 void Settings::save(const path &p) const
 {
-    std::ofstream o(p.string());
+    boost::nowide::ofstream o(p.string());
     if (!o)
         throw std::runtime_error("Cannot open file: " + p.string());
     yaml root;
diff --git a/src/support/filesystem.h b/src/support/filesystem.h
@@ -18,6 +18,8 @@
 
 #include <primitives/filesystem.h>
 
+#include <unordered_map>
+
 #define STAMPS_DIR "stamps"
 #define STORAGE_DIR "storage"
 #define CPPAN_FILENAME "cppan.yml"
