| OLD | NEW |
| 1 // Copyright 2015 The Crashpad Authors. All rights reserved. | 1 // Copyright 2015 The Crashpad Authors. All rights reserved. |
| 2 // | 2 // |
| 3 // Licensed under the Apache License, Version 2.0 (the "License"); | 3 // Licensed under the Apache License, Version 2.0 (the "License"); |
| 4 // you may not use this file except in compliance with the License. | 4 // you may not use this file except in compliance with the License. |
| 5 // You may obtain a copy of the License at | 5 // You may obtain a copy of the License at |
| 6 // | 6 // |
| 7 // http://www.apache.org/licenses/LICENSE-2.0 | 7 // http://www.apache.org/licenses/LICENSE-2.0 |
| 8 // | 8 // |
| 9 // Unless required by applicable law or agreed to in writing, software | 9 // Unless required by applicable law or agreed to in writing, software |
| 10 // distributed under the License is distributed on an "AS IS" BASIS, | 10 // distributed under the License is distributed on an "AS IS" BASIS, |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 #include "base/logging.h" | 29 #include "base/logging.h" |
| 30 #include "base/memory/scoped_ptr.h" | 30 #include "base/memory/scoped_ptr.h" |
| 31 #include "base/numerics/safe_conversions.h" | 31 #include "base/numerics/safe_conversions.h" |
| 32 #include "base/strings/utf_string_conversions.h" | 32 #include "base/strings/utf_string_conversions.h" |
| 33 #include "build/build_config.h" | 33 #include "build/build_config.h" |
| 34 #include "client/crash_report_database.h" | 34 #include "client/crash_report_database.h" |
| 35 #include "client/settings.h" | 35 #include "client/settings.h" |
| 36 #include "tools/tool_support.h" | 36 #include "tools/tool_support.h" |
| 37 #include "util/file/file_io.h" | 37 #include "util/file/file_io.h" |
| 38 #include "util/file/file_reader.h" | 38 #include "util/file/file_reader.h" |
| 39 #include "util/stdlib/move.h" |
| 39 #include "util/misc/uuid.h" | 40 #include "util/misc/uuid.h" |
| 40 | 41 |
| 41 namespace crashpad { | 42 namespace crashpad { |
| 42 namespace { | 43 namespace { |
| 43 | 44 |
| 44 void Usage(const base::FilePath& me) { | 45 void Usage(const base::FilePath& me) { |
| 45 fprintf(stderr, | 46 fprintf(stderr, |
| 46 "Usage: %" PRFilePath " [OPTION]... PID\n" | 47 "Usage: %" PRFilePath " [OPTION]... PID\n" |
| 47 "Operate on Crashpad crash report databases.\n" | 48 "Operate on Crashpad crash report databases.\n" |
| 48 "\n" | 49 "\n" |
| (...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 545 bool is_stdin = false; | 546 bool is_stdin = false; |
| 546 if (new_report_path.value() == FILE_PATH_LITERAL("-")) { | 547 if (new_report_path.value() == FILE_PATH_LITERAL("-")) { |
| 547 is_stdin = true; | 548 is_stdin = true; |
| 548 file_reader.reset(new WeakStdioFileReader(stdin)); | 549 file_reader.reset(new WeakStdioFileReader(stdin)); |
| 549 } else { | 550 } else { |
| 550 scoped_ptr<FileReader> file_path_reader(new FileReader()); | 551 scoped_ptr<FileReader> file_path_reader(new FileReader()); |
| 551 if (!file_path_reader->Open(new_report_path)) { | 552 if (!file_path_reader->Open(new_report_path)) { |
| 552 return EXIT_FAILURE; | 553 return EXIT_FAILURE; |
| 553 } | 554 } |
| 554 | 555 |
| 555 file_reader = file_path_reader.Pass(); | 556 file_reader = crashpad::move(file_path_reader); |
| 556 } | 557 } |
| 557 | 558 |
| 558 CrashReportDatabase::NewReport* new_report; | 559 CrashReportDatabase::NewReport* new_report; |
| 559 CrashReportDatabase::OperationStatus status = | 560 CrashReportDatabase::OperationStatus status = |
| 560 database->PrepareNewCrashReport(&new_report); | 561 database->PrepareNewCrashReport(&new_report); |
| 561 if (status != CrashReportDatabase::kNoError) { | 562 if (status != CrashReportDatabase::kNoError) { |
| 562 return EXIT_FAILURE; | 563 return EXIT_FAILURE; |
| 563 } | 564 } |
| 564 | 565 |
| 565 CrashReportDatabase::CallErrorWritingCrashReport | 566 CrashReportDatabase::CallErrorWritingCrashReport |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 605 | 606 |
| 606 #if defined(OS_POSIX) | 607 #if defined(OS_POSIX) |
| 607 int main(int argc, char* argv[]) { | 608 int main(int argc, char* argv[]) { |
| 608 return crashpad::DatabaseUtilMain(argc, argv); | 609 return crashpad::DatabaseUtilMain(argc, argv); |
| 609 } | 610 } |
| 610 #elif defined(OS_WIN) | 611 #elif defined(OS_WIN) |
| 611 int wmain(int argc, wchar_t* argv[]) { | 612 int wmain(int argc, wchar_t* argv[]) { |
| 612 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain); | 613 return crashpad::ToolSupport::Wmain(argc, argv, crashpad::DatabaseUtilMain); |
| 613 } | 614 } |
| 614 #endif // OS_POSIX | 615 #endif // OS_POSIX |
| OLD | NEW |