CrashpadClient::StartHandler(): accept database, url, and annotations arguments

handler/mac/main.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 13 matching lines @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "client/crash_report_database.h"
 #include "tools/tool_support.h"
 #include "handler/mac/crash_report_exception_handler.h"
 #include "handler/mac/crash_report_upload_thread.h"
 #include "handler/mac/exception_handler_server.h"
 #include "util/mach/child_port_handshake.h"
 #include "util/posix/close_stdio.h"
 #include "util/stdlib/string_number_conversion.h"
+#include "util/string/split_string.h"
 #include "util/synchronization/semaphore.h"
 
 namespace crashpad {
 namespace {
 
-bool SplitString(const std::string& string,
-                 std::string* left,
-                 std::string* right) {
-  size_t equals_pos = string.find('=');
-  if (equals_pos == 0 || equals_pos == std::string::npos) {
-    return false;
-  }
-
-  left->assign(string, 0, equals_pos);
-  right->assign(string, equals_pos + 1, std::string::npos);
-  return true;
-}
-
 void Usage(const std::string& me) {
   fprintf(stderr,
 "Usage: %s [OPTION]...\n"
 "Crashpad's exception handler server.\n"
 "\n"
 "      --annotation=KEY=VALUE  set a process annotation in each crash report\n"
 "      --database=PATH         store the crash report database at PATH\n"
 "      --handshake-fd=FD       establish communication with the client over FD\n"
+"      --url=URL               send crash reports to this Breakpad server URL\n"
 "      --help                  display this help and exit\n"
 "      --version               output version information and exit\n",
           me.c_str());
   ToolSupport::UsageTail(me);
 }
 
 int HandlerMain(int argc, char* argv[]) {
   const std::string me(basename(argv[0]));
 
   enum OptionFlags {
@@ skipping 26 matching lines @@
       {"version", no_argument, nullptr, kOptionVersion},
       {nullptr, 0, nullptr, 0},
   };
 
   int opt;
   while ((opt = getopt_long(argc, argv, "", long_options, nullptr)) != -1) {
     switch (opt) {
       case kOptionAnnotation: {
         std::string key;
         std::string value;
-        if (!SplitString(optarg, &key, &value)) {
+        if (!SplitString(optarg, '=', &key, &value)) {
           ToolSupport::UsageHint(me, "--annotation requires KEY=VALUE");
           return EXIT_FAILURE;
         }
         auto it = options.annotations.find(key);
         if (it != options.annotations.end()) {
           LOG(WARNING) << "duplicate key " << key << ", discarding value "
                        << it->second;
           it->second = value;
         } else {
           options.annotations.insert(std::make_pair(key, value));
@@ skipping 75 matching lines @@
 
   return EXIT_SUCCESS;
 }
 
 }  // namespace
 }  // namespace crashpad
 
 int main(int argc, char* argv[]) {
   return crashpad::HandlerMain(argc, argv);
 }