added vrs tool supporting UTF characters

Author: moversevlad

tools/vrs/VrsCommand.cpp

@@ -293,8 +293,8 @@ VrsCommand::VrsCommand() {
   }
 }
 
-bool VrsCommand::parseCommand(const std::string& appName, const char* cmdName) {
-  cmd = CommandConverter::toEnum(cmdName);
+bool VrsCommand::parseCommand(const std::string& appName, const std::string cmdName) {
+  cmd = CommandConverter::toEnum(cmdName.c_str());
   if (cmd != Command::None) {
     return XR_VERIFY(getCommandSpec(cmd).cmd == cmd);
   }
@@ -310,7 +310,7 @@ bool VrsCommand::parseArgument(
     const string& appName,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode) {
   string arg = argv[argn];
   if (arg == "-to" || arg == "--to") {

tools/vrs/VrsCommand.h

@@ -61,7 +61,7 @@ enum class Command {
 struct VrsCommand {
   VrsCommand();
 
-  bool parseCommand(const std::string& appName, const char* cmdName);
+  bool parseCommand(const std::string& appName, const std::string cmdName);
 
   /// Parse a "logical" command line argument, which may have one or more parts.
   /// @param appName: Name of the application binary for error messages
@@ -78,8 +78,12 @@ struct VrsCommand {
   /// On the other hand, if the argument and possible sub-arguments were valid,
   /// outStatusCode is unchanged (presumably, it's still set to EXIT_SUCCESS),
   /// and the next argument parameter to parse is at argn + 1.
-  bool
-  parseArgument(const std::string& appName, int& argn, int argc, char** argv, int& outStatusCode);
+  bool parseArgument(
+      const std::string& appName,
+      int& argn,
+      int argc,
+      std::vector<std::string> argv,
+      int& outStatusCode);
 
   /// Handle a parameter not recognized by parseArgument and potential additional parsing.
   /// Unrecognized arguments are expected to be additional file paths for merge operations.

tools/vrs/vrs.cpp

@@ -18,11 +18,39 @@
 
 #include <iostream>
 
+#include <Windows.h>
 #include <vrs/os/Utils.h>
 
+namespace {
+
+inline std::vector<std::string> compute_win32_argv() {
+  std::vector<std::string> result;
+  int argc = 0;
+
+  auto deleter = [](wchar_t** ptr) { LocalFree(ptr); };
+  // NOLINTBEGIN(*-avoid-c-arrays)
+  auto wargv = std::unique_ptr<wchar_t*[], decltype(deleter)>(
+      CommandLineToArgvW(GetCommandLineW(), &argc), deleter);
+  // NOLINTEND(*-avoid-c-arrays)
+
+  if (wargv == nullptr) {
+    throw std::runtime_error(
+        "CommandLineToArgvW failed with code " + std::to_string(GetLastError()));
+  }
+
+  result.reserve(static_cast<size_t>(argc));
+  for (size_t i = 0; i < static_cast<size_t>(argc); ++i) {
+    result.push_back(vrs::os::osWstringtoUtf8(wargv[i]));
+  }
+
+  return result;
+}
+} // namespace
+
 using namespace std;
 
-int main(int argc, char** argv) {
+int main(int argc, char** argv_old) {
+  auto argv = compute_win32_argv();
   const string& appName = vrs::os::getFilename(argv[0]);
   if (argc == 1) {
     printHelp(appName);

vrs/os/Utils.h

@@ -34,6 +34,11 @@
 namespace vrs {
 namespace os {
 
+#if IS_WINDOWS_PLATFORM()
+std::wstring osUtf8ToWstring(const std::string& utf8String);
+std::string osWstringtoUtf8(const std::wstring& wstring);
+#endif // IS_WINDOWS_PLATFORM()
+
 /// FILE helpers
 std::FILE* fileOpen(const std::string& path, const char* modes);
 int fileClose(std::FILE* file);

vrs/utils/cli/CliParsing.cpp

@@ -38,7 +38,7 @@ bool parseCopyOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     CopyOptions& copyOptions) {
   if (arg == "--no-progress") {
@@ -116,7 +116,7 @@ bool parseTagOverrideOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     CopyOptions& copyOptions) {
   if (arg == "--file-tag") {
@@ -174,7 +174,7 @@ bool parseTimeAndStreamFilters(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     FilteredFileReader& filteredReader,
     RecordFilterParams& outFilters) {
@@ -214,7 +214,7 @@ bool parseTimeAndStreamFilters(
     if (argn + 2 < argc) {
       try {
         filteredReader.filter.minTime = stod(argv[++argn]);
-        filteredReader.filter.relativeMinTime = isSigned(argv[argn]);
+        filteredReader.filter.relativeMinTime = isSigned(argv[argn].c_str());
         filteredReader.filter.maxTime = stod(argv[++argn]);
         filteredReader.filter.aroundTime = true;
       } catch (logic_error&) {
@@ -286,7 +286,7 @@ bool parseDecimationOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     RecordFilterParams& outFilters) {
   if (arg == "--decimate") {

vrs/utils/cli/CliParsing.h

@@ -45,7 +45,7 @@ bool parseCopyOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     CopyOptions& copyOptions);
 /// Print copy options help
@@ -72,7 +72,7 @@ bool parseTagOverrideOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     CopyOptions& copyOptions);
 /// Print tag override help
@@ -101,7 +101,7 @@ bool parseTimeAndStreamFilters(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     FilteredFileReader& filteredReader,
     RecordFilterParams& outFilters);
@@ -129,7 +129,7 @@ bool parseDecimationOptions(
     const string& arg,
     int& argn,
     int argc,
-    char** argv,
+    std::vector<std::string> argv,
     int& outStatusCode,
     RecordFilterParams& outFilters);
 /// Print decimation options help