win: get tools/crashpad_database_util mostly working

tools/crashpad_database_util.cc

 // Copyright 2015 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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include <errno.h>
 #include <getopt.h>
-#include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <time.h>
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/numerics/safe_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "client/crash_report_database.h"
 #include "client/settings.h"
 #include "tools/tool_support.h"
 #include "util/file/file_io.h"
 #include "util/file/file_reader.h"
 #include "util/misc/uuid.h"
 
+#if defined(OS_MACOSX)
+#include <libgen.h>

[Mark Mentovai, 2015/05/05 22:25:27]

Remove this. It was only here for basename().

[scottmg, 2015/05/05 23:03:37]

Done.

+#endif  // OS_MACOSX
+
+#if defined(OS_POSIX)
+base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
+  return path;
+}
+#elif defined(OS_WIN)
+base::FilePath::StringType UTF8ToFilePathStringType(const char* path) {
+  return base::UTF8ToUTF16(path);
+}
+#endif
+
 namespace crashpad {
 namespace {
 
-void Usage(const std::string& me) {
+void Usage(const base::FilePath& me) {
   fprintf(stderr,
-"Usage: %s [OPTION]... PID\n"
+"Usage: %" PRFilePath " [OPTION]... PID\n"
 "Operate on Crashpad crash report databases.\n"
 "\n"
 "  -d, --database=PATH             operate on the crash report database at PATH\n"
 "      --show-client-id            show the client ID\n"
 "      --show-uploads-enabled      show whether uploads are enabled\n"
 "      --show-last-upload-attempt-time\n"
 "                                  show the last-upload-attempt time\n"
 "      --show-pending-reports      show reports eligible for upload\n"
 "      --show-completed-reports    show reports not eligible for upload\n"
 "      --show-all-report-info      with --show-*-reports, show more information\n"
 "      --show-report=UUID          show report stored under UUID\n"
 "      --set-uploads-enabled=BOOL  enable or disable uploads\n"
 "      --set-last-upload-attempt-time=TIME\n"
 "                                  set the last-upload-attempt time to TIME\n"
 "      --new-report=PATH           submit a new report at PATH\n"
 "      --utc                       show and set UTC times instead of local\n"
 "      --help                      display this help and exit\n"
 "      --version                   output version information and exit\n",
-          me.c_str());
+          me.value().c_str());
   ToolSupport::UsageTail(me);
 }
 
 struct Options {
   std::vector<UUID> show_reports;
   std::vector<base::FilePath> new_report_paths;
   const char* database;
   const char* set_last_upload_attempt_time_string;
   time_t set_last_upload_attempt_time;
   bool show_client_id;
@@ skipping 23 matching lines @@
   const char* const kTrueWords[] = {
       "1",
       "true",
       "yes",
       "on",
       "enabled",
       "set",
   };
 
   for (size_t index = 0; index < arraysize(kFalseWords); ++index) {
-    if (strcasecmp(string, kFalseWords[index]) == 0) {
+    if (base::strcasecmp(string, kFalseWords[index]) == 0) {
       *boolean = false;
       return true;
     }
   }
 
   for (size_t index = 0; index < arraysize(kTrueWords); ++index) {
-    if (strcasecmp(string, kTrueWords[index]) == 0) {
+    if (base::strcasecmp(string, kTrueWords[index]) == 0) {
       *boolean = true;
       return true;
     }
   }
 
   return false;
 }
 
 // Converts |boolean| to a string, either "true" or "false".
 std::string BoolToString(bool boolean) {
   return std::string(boolean ? "true" : "false");
 }
 
 // Converts |string| to |time|, returning true if a conversion could be
 // performed, and false without setting |boolean| if no conversion could be
 // performed. Various time formats are recognized, including several string
 // representations and a numeric time_t representation. The special string
 // "never" is recognized as |string| and converts to a |time| value of 0. |utc|,
 // when true, causes |string| to be interpreted as a UTC time rather than a
 // local time when the time zone is ambiguous.
 bool StringToTime(const char* string, time_t* time, bool utc) {
-  if (strcasecmp(string, "never") == 0) {
+  if (base::strcasecmp(string, "never") == 0) {
     *time = 0;
     return true;
   }
 
   const char* end = string + strlen(string);
 
   const char* const kFormats[] = {
       "%Y-%m-%d %H:%M:%S %Z",
       "%Y-%m-%d %H:%M:%S",
       "%+",
   };
 
   for (size_t index = 0; index < arraysize(kFormats); ++index) {
     tm time_tm;
     const char* strptime_result = strptime(string, kFormats[index], &time_tm);
     if (strptime_result == end) {
       if (utc) {
         *time = timegm(&time_tm);
       } else {
-        *time = timelocal(&time_tm);
+        *time = mktime(&time_tm);
       }
 
       return true;
     }
   }
 
   char* end_result;
   errno = 0;
   long long strtoll_result = strtoll(string, &end_result, 0);
   if (end_result == end && errno == 0 &&
       base::IsValueInRangeForNumericType<time_t>(strtoll_result)) {
     *time = strtoll_result;
     return true;
   }
 
   return false;
 }
 
-// Converst |time_tt| to a string, and returns it. |utc| determines whether the
+// Converts |time_tt| to a string, and returns it. |utc| determines whether the
 // converted time will reference local time or UTC. If |time_tt| is 0, the
 // string "never" will be returned as a special case.
 std::string TimeToString(time_t time_tt, bool utc) {
   if (time_tt == 0) {
     return std::string("never");
   }
 
   tm time_tm;
   if (utc) {
+#if defined(OS_POSIX)
     gmtime_r(&time_tt, &time_tm);
+#elif defined(OS_WIN)
+    gmtime_s(&time_tm, &time_tt);

[Mark Mentovai, 2015/05/05 22:19:49]

gmtime_r() and localtime_r() can wrap gmtime_s() and localtime_s() with the
arguments swapped in compat/win/time.*. Then we can write this without #ifdefs.

[scottmg, 2015/05/05 23:03:37]

Done.

+#endif  // OS_POSIX
   } else {
+#if defined(OS_POSIX)
     localtime_r(&time_tt, &time_tm);
+#elif defined(OS_WIN)
+    localtime_s(&time_tm, &time_tt);
+#endif  // OS_POSIX
   }
 
   char string[64];
   CHECK_NE(
       strftime(string, arraysize(string), "%Y-%m-%d %H:%M:%S %Z", &time_tm),
       0u);
 
   return std::string(string);
 }
 
 // Shows information about a single |report|. |space_count| is the number of
 // spaces to print before each line that is printed. |utc| determines whether
 // times should be shown in UTC or the local time zone.
 void ShowReport(const CrashReportDatabase::Report& report,
                 size_t space_count,
                 bool utc) {
   std::string spaces(space_count, ' ');
 
-  printf("%sPath: %s\n", spaces.c_str(), report.file_path.value().c_str());
+  printf("%sPath: %" PRFilePath "\n",
+         spaces.c_str(),
+         report.file_path.value().c_str());
   if (!report.id.empty()) {
     printf("%sRemote ID: %s\n", spaces.c_str(), report.id.c_str());
   }
   printf("%sCreation time: %s\n",
          spaces.c_str(),
          TimeToString(report.creation_time, utc).c_str());
   printf("%sUploaded: %s\n",
          spaces.c_str(),
          BoolToString(report.uploaded).c_str());
   printf("%sLast upload attempt time: %s\n",
@@ skipping 15 matching lines @@
 
   for (const CrashReportDatabase::Report& report : reports) {
     printf("%s%s%s\n", spaces.c_str(), report.uuid.ToString().c_str(), colon);
     if (options.show_all_report_info) {
       ShowReport(report, space_count + 2, options.utc);
     }
   }
 }
 
 int DatabaseUtilMain(int argc, char* argv[]) {
-  const std::string me(basename(argv[0]));
+  const base::FilePath me(
+      base::FilePath(UTF8ToFilePathStringType(argv[0])).BaseName());
 
   enum OptionFlags {
     // “Short” (single-character) options.
     kOptionDatabase = 'd',
 
     // Long options without short equivalents.
     kOptionLastChar = 255,
     kOptionShowClientID,
     kOptionShowUploadsEnabled,
     kOptionShowLastUploadAttemptTime,
@@ skipping 37 matching lines @@
       {"new-report", required_argument, nullptr, kOptionNewReport},
       {"utc", no_argument, nullptr, kOptionUTC},
       {"help", no_argument, nullptr, kOptionHelp},
       {"version", no_argument, nullptr, kOptionVersion},
       {nullptr, 0, nullptr, 0},
   };
 
   Options options = {};
 
   int opt;
-  while ((opt = getopt_long(argc, argv, "d:", long_options, nullptr)) != -1) {
+  while ((opt = getopt_long(

[Mark Mentovai, 2015/05/05 22:19:49]

This fit on one line before and you haven’t changed anything that would make it
not fit.

[scottmg, 2015/05/05 23:03:37]

Oops, missed that in my conversions back and forth on string encodings.

+              argc, argv, "d:", long_options, nullptr)) != -1) {
     switch (opt) {
       case kOptionDatabase: {
         options.database = optarg;
         break;
       }
       case kOptionShowClientID: {
         options.show_client_id = true;
         break;
       }
       case kOptionShowUploadsEnabled: {
@@ skipping 31 matching lines @@
           return EXIT_FAILURE;
         }
         options.has_set_uploads_enabled = true;
         break;
       }
       case kOptionSetLastUploadAttemptTime: {
         options.set_last_upload_attempt_time_string = optarg;
         break;
       }
       case kOptionNewReport: {
-        options.new_report_paths.push_back(base::FilePath(optarg));
+        options.new_report_paths.push_back(
+            base::FilePath(UTF8ToFilePathStringType(optarg)));
         break;
       }
       case kOptionUTC: {
         options.utc = true;
         break;
       }
       case kOptionHelp: {
         Usage(me);
         return EXIT_SUCCESS;
       }
@@ skipping 38 matching lines @@
                                  options.new_report_paths.size();
   const size_t set_operations =
       options.has_set_uploads_enabled +
       (options.set_last_upload_attempt_time_string != nullptr);
 
   if (show_operations + set_operations == 0) {
     ToolSupport::UsageHint(me, "nothing to do");
     return EXIT_FAILURE;
   }
 
-  scoped_ptr<CrashReportDatabase> database(
-      CrashReportDatabase::Initialize(base::FilePath(options.database)));
+  scoped_ptr<CrashReportDatabase> database(CrashReportDatabase::Initialize(
+      base::FilePath(UTF8ToFilePathStringType(options.database))));
   if (!database) {
     return EXIT_FAILURE;
   }
 
   Settings* settings = database->GetSettings();
 
   // Handle the “show” options before the “set” options so that when they’re
   // specified together, the “show” option reflects the initial state.
 
   if (options.show_client_id) {
@@ skipping 23 matching lines @@
     if (!settings->GetLastUploadAttemptTime(&last_upload_attempt_time)) {
       return EXIT_FAILURE;
     }
 
     const char* prefix =
         (show_operations > 1) ? "Last upload attempt time: " : "";
 
     printf("%s%s (%ld)\n",
            prefix,
            TimeToString(last_upload_attempt_time, options.utc).c_str(),
-           implicit_cast<long>(last_upload_attempt_time));
+           static_cast<long>(last_upload_attempt_time));
   }
 
   if (options.show_pending_reports) {
     std::vector<CrashReportDatabase::Report> pending_reports;
     if (database->GetPendingReports(&pending_reports) !=
         CrashReportDatabase::kNoError) {
       return EXIT_FAILURE;
     }
 
     if (show_operations > 1) {
@@ skipping 23 matching lines @@
         database->LookUpCrashReport(uuid, &report);
     if (status == CrashReportDatabase::kNoError) {
       if (show_operations > 1) {
         printf("Report %s:\n", uuid.ToString().c_str());
       }
       ShowReport(report, show_operations > 1 ? 2 : 0, options.utc);
     } else if (status == CrashReportDatabase::kReportNotFound) {
       // If only asked to do one thing, a failure to find the single requested
       // report should result in a failure exit status.
       if (show_operations + set_operations == 1) {
-        fprintf(stderr, "%s: Report not found\n", me.c_str());
+        fprintf(
+            stderr, "%" PRFilePath ": Report not found\n", me.value().c_str());
         return EXIT_FAILURE;
       }
       printf("Report %s not found\n", uuid.ToString().c_str());
     } else {
       return EXIT_FAILURE;
     }
   }
 
   if (options.has_set_uploads_enabled &&
       !settings->SetUploadsEnabled(options.set_uploads_enabled)) {
@@ skipping 44 matching lines @@
     const char* prefix = (show_operations > 1) ? "New report ID: " : "";
     printf("%s%s\n", prefix, uuid.ToString().c_str());
   }
 
   return EXIT_SUCCESS;
 }
 
 }  // namespace
 }  // namespace crashpad
 
+#if defined(OS_POSIX)
 int main(int argc, char* argv[]) {
   return crashpad::DatabaseUtilMain(argc, argv);
 }
+#elif defined(OS_WIN)
+int wmain(int argc, wchar_t* argv[]) {
+  scoped_ptr<char*[]> argv_as_utf8(new char*[argc]);

[Mark Mentovai, 2015/05/05 22:19:49]

I imagine that we’ll want this to be in tool_support or something, but you can
move it when another tool is ready to use it. (Maybe you’ve already done that in
the generate_dump change.)

[scottmg, 2015/05/05 23:03:37]

Yeah, I did that in the generate_dump CL as it's then required in > 1 place.

+  std::vector<std::string> storage;
+  storage.reserve(argc);
+  for (int i = 0; i < argc; ++i) {
+    storage.push_back(base::UTF16ToUTF8(argv[i]));
+    argv_as_utf8[i] = &storage[i][0];
+  }
+  return crashpad::DatabaseUtilMain(argc, argv_as_utf8.get());
+}
+#endif  // OS_POSIX