Changed handling of cli arguments to std::vector<string> by default.

ecal/core/include/ecal/config/configuration.h

@@ -62,7 +62,7 @@ namespace eCAL
 
         ECAL_API Configuration();
         ECAL_API Configuration(int argc_ , char **argv_);
-        ECAL_API Configuration(std::vector<std::string> args_);
+        ECAL_API Configuration(std::vector<std::string>& args_);
 
         ECAL_API void InitConfigWithDefaultIni();
         ECAL_API void InitConfig(std::string ini_path_ = std::string(""));
@@ -75,6 +75,6 @@ namespace eCAL
           std::string                    ecal_ini_file_path{};
 
         private:
-          ECAL_API void Init(int argc_ , char **argv_);
+          ECAL_API void Init(std::vector<std::string>& args_);
     };
 }

ecal/core/src/config/ecal_cmd_parser.cpp

@@ -193,16 +193,16 @@ namespace eCAL
     : m_dump_config{false}
     {}
 
-    CmdParser::CmdParser(int argc_ , char **argv_)
+    CmdParser::CmdParser(std::vector<std::string>& arguments_)
     : CmdParser()
     {
-      parseArguments(argc_, argv_);
+      parseArguments(arguments_);
     }
 
-    void CmdParser::parseArguments(int argc_, char **argv_)
+    void CmdParser::parseArguments(std::vector<std::string>& arguments_)
     {
 #if ECAL_CORE_COMMAND_LINE
-      if ((argc_ > 0) && (argv_ != nullptr))
+      if (!arguments_.empty())
       {
         // define command line object
         TCLAP::CmdLine cmd("", ' ', ECAL_VERSION);
@@ -224,7 +224,7 @@ namespace eCAL
         cmd.setOutput(&advanced_tclap_output);
 
         // parse command line
-        cmd.parse(argc_, argv_);
+        cmd.parse(arguments_);
 
         // set globals
         if (dump_config_arg.isSet())
@@ -242,10 +242,7 @@ namespace eCAL
         }
       }
 #endif  
-      if (argv_ != nullptr)
-      {
-        for (size_t i = 0; i < static_cast<size_t>(argc_); ++i) if (argv_[i] != nullptr) m_task_parameter.emplace_back(argv_[i]);
-      }
+      m_task_parameter = arguments_;
     }
 
     bool CmdParser::getDumpConfig() const                        { return m_dump_config; };

ecal/core/src/config/ecal_cmd_parser.h

@@ -44,10 +44,10 @@ namespace eCAL
     class CmdParser
     {    
     public:
-      CmdParser(int argc_ , char **argv_);
+      CmdParser(std::vector<std::string>& arguments_);
       CmdParser();
 
-      void                      parseArguments(int argc_, char **argv_);
+      void                      parseArguments(std::vector<std::string>& arguments_);
 
       bool                      getDumpConfig() const;
       std::vector<std::string>& getConfigKeys();

ecal/core/src/config/ecal_config_initializer.cpp

@@ -221,21 +221,24 @@ namespace eCAL
 
     Configuration::Configuration(int argc_ , char **argv_)
     {
-      Init(argc_, argv_);
+      std::vector<std::string> arguments;
+      if (argc_ > 0 && argv_ != nullptr)
+      {
+        for (size_t i = 0; i < static_cast<size_t>(argc_); ++i) 
+          if (argv_[i] != nullptr) 
+            arguments.emplace_back(argv_[i]);
+      } 
+      Init(arguments);
     }
 
-    Configuration::Configuration(std::vector<std::string> args_)
-    {
-      args_.emplace(args_.begin(), eCAL::Process::GetProcessName());
-      std::vector<const char*> argv(args_.size());
-      std::transform(args_.begin(), args_.end(), argv.begin(), [](std::string& s) {return s.c_str();});
-
-      Init(static_cast<int>(argv.size()), const_cast<char**>(argv.data()));
+    Configuration::Configuration(std::vector<std::string>& args_)
+    {      
+      Init(args_);
     }
 
-    void Configuration::Init(int argc_ , char **argv_)
+    void Configuration::Init(std::vector<std::string>& arguments_)
     {
-      Config::CmdParser parser(argc_, argv_);
+      Config::CmdParser parser(arguments_);
 
       command_line_arguments.config_keys       = parser.getConfigKeys();
       command_line_arguments.specified_config  = parser.getUserIni();

ecal/tests/cpp/config_test/src/config_test.cpp

@@ -237,7 +237,7 @@ TEST(core_cpp_config, config_cmd_parser)
 
   eCAL::Config::CmdParser parser;
 
-  std::vector<const char*> arguments;
+  std::vector<std::string> arguments;
 
   const std::string set_config_key = "--ecal-set-config-key ";
   const std::string sep_slash = "/";
@@ -257,18 +257,14 @@ TEST(core_cpp_config, config_cmd_parser)
 
   arguments.push_back("test_config_cmd_parser");
   arguments.push_back("--ecal-ini-file customIni.ini");
-  std::string host_group_string = set_config_key + network + sep_slash + host_group_name + sep_col + config_test_machine;
-  arguments.push_back(host_group_string.data());
-  std::string network_enabled_string = set_config_key + network + sep_slash + network_enabled + sep_col + is_network_enabled;
-  arguments.push_back(network_enabled_string.data());
-  std::string registration_to_string = set_config_key + common + sep_slash + registration_timeout + sep_col + reg_to_value;
-  arguments.push_back(registration_to_string.data());
-  std::string registration_rf_string = set_config_key + common + sep_slash + registration_refresh + sep_col + reg_rf_value;
-  arguments.push_back(registration_rf_string.data());
+  arguments.push_back(set_config_key + network + sep_slash + host_group_name + sep_col + config_test_machine);
+  arguments.push_back(set_config_key + network + sep_slash + network_enabled + sep_col + is_network_enabled);
+  arguments.push_back(set_config_key + common + sep_slash + registration_timeout + sep_col + reg_to_value);
+  arguments.push_back(set_config_key + common + sep_slash + registration_refresh + sep_col + reg_rf_value);
 
   try
   {
-    parser.parseArguments(static_cast<int>(arguments.size()), const_cast<char**>(arguments.data()));
+    parser.parseArguments(arguments);
   }
   catch(const std::runtime_error& e)
   {
@@ -291,13 +287,13 @@ TEST(CmdParserDeathTest, config_cmd_parser_death_test)
 {
   eCAL::Config::CmdParser parser;
 
-  std::vector<const char*> arguments;
+  std::vector<std::string> arguments;
 
   arguments.push_back("test_config_cmd_parser_death_test");
   arguments.push_back("--ecal-ini-file someNotValidFileName.ini");
 
   ASSERT_THROW(
-    parser.parseArguments(static_cast<int>(arguments.size()), const_cast<char**>(arguments.data())),
+    parser.parseArguments(arguments),
     std::runtime_error
   );
 }