Merge pull request #9254

d6b35e9 Cleanup string_tools. 1. Use boost::filesystem for already available operations. 2. Use boost::string for already available operations. (0xFFFC0000)

contrib/epee/include/string_tools.h

@@ -31,6 +31,7 @@
 #include "mlocker.h"
 
 #include <boost/utility/string_ref.hpp>
+#include <boost/algorithm/string.hpp> 
 #include <sstream>
 #include <string>
 #include <cstdint>
@@ -69,23 +70,19 @@ namespace string_tools
 #ifdef _WIN32
    std::string get_current_module_path();
 #endif
-  bool set_module_name_and_folder(const std::string& path_to_process_);
+  void set_module_name_and_folder(const std::string& path_to_process_);
-  bool trim_left(std::string& str);
+  void trim_left(std::string& str);
-  bool trim_right(std::string& str);
+  void trim_right(std::string& str);
   //----------------------------------------------------------------------------
   inline std::string& trim(std::string& str)
   {
-    trim_left(str);
+    boost::trim(str);
-    trim_right(str);
     return str;
   }
   //----------------------------------------------------------------------------
-  inline std::string trim(const std::string& str_)
+  inline std::string trim(const std::string& str)
   {
-    std::string str = str_;
+    return boost::trim_copy(str);
-    trim_left(str);
-    trim_right(str);
-    return str;
   }
   std::string pad_string(std::string s, size_t n, char c = ' ', bool prepend = false);
   

contrib/epee/src/readline_buffer.cpp

@@ -1,4 +1,5 @@
 #include "readline_buffer.h"
+#include "string_tools.h"
 #include <readline/readline.h>
 #include <readline/history.h>
 #include <iostream>
@@ -173,7 +174,7 @@ static void handle_line(char* line)
     line_stat = rdln::full;
     the_line = line;
     std::string test_line = line;
-    boost::trim_right(test_line);
+    epee::string_tools::trim_right(test_line);
     if(!test_line.empty())
     {
       if (!same_as_last_line(test_line))

contrib/epee/src/string_tools.cpp

@@ -38,9 +38,12 @@
 #include <cstdlib>
 #include <string>
 #include <type_traits>
+#include <system_error>
 #include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/utility/string_ref.hpp>
+#include <boost/filesystem.hpp>
 #include "misc_log_ex.h"
 #include "storages/parserse_base_utils.h"
 #include "hex.h"
@@ -158,45 +161,32 @@ namespace string_tools
   }
 #endif
 
-    bool set_module_name_and_folder(const std::string& path_to_process_)
+  void set_module_name_and_folder(const std::string& path_to_process_)
-	{
+  {
-    std::string path_to_process = path_to_process_;
+    boost::filesystem::path path_to_process = path_to_process_;
+
 #ifdef _WIN32
     path_to_process = get_current_module_path();
 #endif 
-		std::string::size_type a = path_to_process.rfind( '\\' );
-		if(a == std::string::npos )
-		{
-			a = path_to_process.rfind( '/' );
-		}
-		if ( a != std::string::npos )
-		{	
-			get_current_module_name() = path_to_process.substr(a+1, path_to_process.size());
-			get_current_module_folder() = path_to_process.substr(0, a);
-			return true;
-		}else
-			return false;
 
-	}
+    get_current_module_name() = path_to_process.filename().string();
+    get_current_module_folder() = path_to_process.parent_path().string();
+  }
 
 	//----------------------------------------------------------------------------
-	bool trim_left(std::string& str)
+  void trim_left(std::string& str)
-	{
+  {
-		for(std::string::iterator it = str.begin(); it!= str.end() && isspace(static_cast<unsigned char>(*it));)
+    boost::trim_left(str);
-			str.erase(str.begin());
+    return;
+  }
 
-		return true;
-	}
 	//----------------------------------------------------------------------------
-	bool trim_right(std::string& str)
+  void trim_right(std::string& str)
-	{
+  {
+    boost::trim_right(str);
+    return;
+  }
 
-		for(std::string::reverse_iterator it = str.rbegin(); it!= str.rend() && isspace(static_cast<unsigned char>(*it));)
-			str.erase( --((it++).base()));
-
-		return true;
-	}
-  //----------------------------------------------------------------------------
   std::string pad_string(std::string s, size_t n, char c, bool prepend)
   {
     if (s.size() < n)
@@ -209,28 +199,17 @@ namespace string_tools
     return s;
   }
   
-    std::string get_extension(const std::string& str)
+  std::string get_extension(const std::string& str)
-	{
+  {
-		std::string res;
+    return boost::filesystem::path(str).extension().string();
-		std::string::size_type pos = str.rfind('.');
+  }
-		if(std::string::npos == pos)
-			return res;
 
-		res = str.substr(pos+1, str.size()-pos);
-		return res;
-	}
 	//----------------------------------------------------------------------------
-	std::string cut_off_extension(const std::string& str)
+  std::string cut_off_extension(const std::string& str)
-	{
+  {
-		std::string res;
+    return boost::filesystem::path(str).stem().string();
-		std::string::size_type pos = str.rfind('.');
+  }
-		if(std::string::npos == pos)
-			return str;
 
-		res = str.substr(0, pos);
-		return res;
-	}
-  //----------------------------------------------------------------------------
 #ifdef _WIN32
   std::wstring utf8_to_utf16(const std::string& str)
   {