Update dart:io to convert strings between UTF8 and current code page

runtime/bin/main.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 213 matching lines @@
   }
   return false;
 }
 
 
 static void WriteToPerfEventsFile(const char* buffer, int64_t num_bytes) {
   ASSERT(perf_events_symbols_file != NULL);
   perf_events_symbols_file->WriteFully(buffer, num_bytes);
 }
 
+static bool Utf8ConvertArgv(int argc, char** argv) {
+  // Convert all the arguments to UTF8. On Windows, the arguments are
+  // encoded in the current code page and not UTF8.

[Søren Gjesse, 2012/11/13 12:48:45]

Document return value.

[Mads Ager (google), 2012/11/13 14:50:17]

Done.

+  bool result = false;
+  for (int i = 0; i < argc; i++) {
+    char* arg = argv[i];
+    argv[i] = StringUtils::SystemStringToUtf8(arg);
+    if (argv[i] != arg) result = true;

[Søren Gjesse, 2012/11/13 12:48:45]

Maybe change this to

if (argv == 0) {
  result = argv[i] != arg;
} else {
  ASSERT(result == (argv[i] != arg));
}

[Mads Ager (google), 2012/11/13 14:50:17]

Done.

+  }
+  return result;
+}
+
 
 // Parse out the command line arguments. Returns -1 if the arguments
 // are incorrect, 0 otherwise.
 static int ParseArguments(int argc,
                           char** argv,
                           CommandLineOptions* vm_options,
                           char** executable_name,
                           char** script_name,
                           CommandLineOptions* dart_options,
                           bool* print_flags_seen) {
@@ skipping 386 matching lines @@
   char* script_name;
   CommandLineOptions vm_options(argc);
   CommandLineOptions dart_options(argc);
   bool print_flags_seen = false;
 
   // Perform platform specific initialization.
   if (!Platform::Initialize()) {
     fprintf(stderr, "Initialization failed\n");
   }
 
+  // On Windows, the argv strings are code page incoded and not

[Søren Gjesse, 2012/11/13 12:48:45]

incoded -> encoded

[Mads Ager (google), 2012/11/13 14:50:17]

Done.

+  // utf8. We need to convert them to utf8.
+  bool argv_converted = Utf8ConvertArgv(argc, argv);
+
   // Parse command line arguments.
   if (ParseArguments(argc,
                      argv,
                      &vm_options,
                      &executable_name,
                      &script_name,
                      &dart_options,
                      &print_flags_seen) < 0) {
     if (has_help_option) {
       PrintUsage();
@@ skipping 67 matching lines @@
   Dart_Handle library = Dart_RootLibrary();
   if (Dart_IsNull(library)) {
     return ErrorExit("Unable to find root library for '%s'\n",
                      script_name);
   }
   // Set debug breakpoint if specified on the command line.
   if (breakpoint_at != NULL) {
     result = SetBreakpoint(breakpoint_at, library);
     if (Dart_IsError(result)) {
       return ErrorExit("Error setting breakpoint at '%s': %s\n",
-          breakpoint_at,
-          Dart_GetError(result));
+                       breakpoint_at,
+                       Dart_GetError(result));
     }
   }
 
   // Lookup and invoke the top level main function.
   result = Dart_Invoke(library, DartUtils::NewString("main"), 0, NULL);
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
   // Keep handling messages until the last active receive port is closed.
   result = Dart_RunLoop();
   if (Dart_IsError(result)) {
     return ErrorExit("%s\n", Dart_GetError(result));
   }
 
   Dart_ExitScope();
   // Dump symbol information for the profiler.
   DumpPprofSymbolInfo();
   // Shutdown the isolate.
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
+  // Free copied argument strings if converted.
+  if (argv_converted) {
+    for (int i = 0; i < argc; i++) free(argv[i]);
+  }
 
   return 0;
 }