Fix for issue 11112 align flags to formats used by other tools.

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 94 matching lines @@
   if (*arg != '\0') {
     return false;
   }
   has_verbose_option = true;
   return true;
 }
 
 
 static bool ProcessBreakpointOption(const char* funcname) {
   ASSERT(funcname != NULL);
+  if (*funcname == '\0') {
+    return false;
+  }
   breakpoint_at = funcname;
   return true;
 }
 
 
 static bool ProcessPackageRootOption(const char* arg) {
   ASSERT(arg != NULL);
+  if (*arg == '\0' || *arg == '-') {
+    return false;
+  }
   package_root = arg;
   return true;
 }
 
 
 static bool ProcessCompileAllOption(const char* arg) {
   ASSERT(arg != NULL);
   if (*arg != '\0') {
     return false;
   }
@@ skipping 58 matching lines @@
   if (*arg != '\0') {
     return false;
   }
   has_print_script = true;
   return true;
 }
 
 
 static bool ProcessVmStatsRootOption(const char* arg) {
   ASSERT(arg != NULL);
+  if (*arg == '\0') {
+    return false;
+  }
   vmstats_root = arg;
   return true;
 }
 
 
 static bool ProcessGenScriptSnapshotOption(const char* filename) {
   if (filename != NULL && strlen(filename) != 0) {
     // Ensure that are already running using a full snapshot.
     if (snapshot_buffer == NULL) {
       Log::PrintErr("Script snapshots cannot be generated in this version of"
                     " dart\n");
       return false;
     }
     snapshot_file = File::Open(filename, File::kWriteTruncate);
     if (snapshot_file == NULL) {
       Log::PrintErr("Unable to open file %s for writing the snapshot\n",
                     filename);
       return false;
     }
     generate_script_snapshot = true;
+    return true;
   }
-  return true;
+  return false;
 }
 
 
 static struct {
   const char* option_name;
   bool (*process)(const char* option);
 } main_options[] = {
   // Standard options shared with dart2js.
   { "--version", ProcessVersionOption },
   { "--help", ProcessHelpOption },
   { "-h", ProcessHelpOption },
   { "--verbose", ProcessVerboseOption },
   { "-v", ProcessVerboseOption },
   { "--package-root=", ProcessPackageRootOption },
-  { "-p", ProcessPackageRootOption },
   // VM specific options to the standalone dart program.
-  { "--break_at=", ProcessBreakpointOption },
+  { "--break-at=", ProcessBreakpointOption },
   { "--compile_all", ProcessCompileAllOption },
   { "--debug", ProcessDebugOption },
-  { "--generate-script-snapshot=", ProcessGenScriptSnapshotOption },
+  { "--snapshot=", ProcessGenScriptSnapshotOption },
   { "--stats-root=", ProcessVmStatsRootOption },
   { "--stats", ProcessVmStatsOption },
   { "--print-script", ProcessPrintScriptOption },
   { "--check-function-fingerprints", ProcessFingerprintedFunctions },
   { NULL, NULL }
 };
 
 
 static bool ProcessMainOptions(const char* option) {
   int i = 0;
   const char* name = main_options[0].option_name;
+  int option_length = strlen(option);
   while (name != NULL) {
     int length = strlen(name);
-    if (strncmp(option, name, length) == 0) {
-      return main_options[i].process(option + length);
+    if ((option_length >= length) && (strncmp(option, name, length) == 0)) {
+      if (!main_options[i].process(option + length)) {
+        Log::PrintErr("Invalid option specification : '%s'\n", option);
+      }
+      return true;
     }
     i += 1;
     name = main_options[i].option_name;
   }
   return false;
 }
 
 
 // Convert all the arguments to UTF8. On Windows, the arguments are
 // encoded in the current code page and not UTF8.
@@ skipping 31 matching lines @@
 
   // Start the rest after the executable name.
   int i = 1;
 
   // Parse out the vm options.
   while (i < argc) {
     if (ProcessMainOptions(argv[i])) {
       i++;
     } else {
       // Check if this flag is a potentially valid VM flag.
-      if (!IsValidFlag(argv[i], kPrefix, kPrefixLen)) {
+      const char* kChecked = "-c";
+      const char* kPackageRoot = "-p";
+      if (strncmp(argv[i], kPackageRoot, strlen(kPackageRoot)) == 0) {
+        if (!ProcessPackageRootOption(argv[i] + strlen(kPackageRoot))) {
+          i++;
+          if (!ProcessPackageRootOption(argv[i])) {
+            Log::PrintErr("Invalid option specification : '%s'\n", argv[i - 1]);
+            i++;
+            break;
+          }
+        }
+      } else if (strncmp(argv[i], kChecked, strlen(kChecked)) == 0) {
+        vm_options->AddArgument("--checked");
+      } else if (!IsValidFlag(argv[i], kPrefix, kPrefixLen)) {
         break;
       }
       const char* kPrintFlags1 = "--print-flags";
       const char* kPrintFlags2 = "--print_flags";
       if ((strncmp(argv[i], kPrintFlags1, strlen(kPrintFlags1)) == 0) ||
           (strncmp(argv[i], kPrintFlags2, strlen(kPrintFlags2)) == 0)) {
         *print_flags_seen = true;
       }
       const char* kVerboseDebug = "--verbose_debug";
       if (strncmp(argv[i], kVerboseDebug, strlen(kVerboseDebug)) == 0) {
@@ skipping 213 matching lines @@
 "--help\n"
 "  Display this message (add --verbose for information about all VM options).\n"
 "\n"
 "--package-root=<path>\n"
 "  Where to find packages, that is, \"package:...\" imports.\n"
 "\n"
 "--debug[:<port number>]\n"
 "  enables debugging and listens on specified port for debugger connections\n"
 "  (default port number is 5858)\n"
 "\n"
-"--break_at=<location>\n"
+"--break-at=<location>\n"
 "  sets a breakpoint at specified location where <location> is one of :\n"
 "  url:<line_num> e.g. test.dart:10\n"
 "  [<class_name>.]<function_name> e.g. B.foo\n"
 "\n"
-"--generate-script-snapshot=<file_name>\n"
+"--snapshot=<file_name>\n"
 "  loads Dart script and generates a snapshot in the specified file\n"
 "\n"
 "--print-script\n"
 "  generates Dart source code back and prints it after parsing a Dart script\n"
 "\n"
 "--stats[:<port number>]\n"
 "  enables VM stats service and listens on specified port for HTTP requests\n"
 "  (default port number is dynamically assigned)\n"
 "\n"
 "--stats-root=<path>\n"
@@ skipping 287 matching lines @@
 
   return Process::GlobalExitCode();
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   return dart::bin::main(argc, argv);
 }