aboutsummaryrefslogtreecommitdiff
path: root/src/tools/linux
diff options
context:
space:
mode:
authorTobias Sargeant <tobiasjs@google.com>2017-10-18 16:39:09 +0100
committerTobias Sargeant <tobiasjs@chromium.org>2017-10-18 15:44:59 +0000
commit072f86ca83bb7138fe33f10b6380badd9ef7f065 (patch)
treec092b3f9e8788143d50211fa2e96a62148054d32 /src/tools/linux
parentMove main executable handling out of procmaps parser loop. (diff)
downloadbreakpad-072f86ca83bb7138fe33f10b6380badd9ef7f065.tar.xz
Provide helper wrappers for basename(3) and dirname(3)
This hides the need to provide mutable C strings, and unifies existing basename calls and variations in a single location. Change-Id: Idfb449c47b1421f1a751efc3d7404f15f8b369ca Reviewed-on: https://chromium-review.googlesource.com/725731 Reviewed-by: Mark Mentovai <mark@chromium.org> Reviewed-by: Mike Frysinger <vapier@chromium.org>
Diffstat (limited to 'src/tools/linux')
-rw-r--r--src/tools/linux/md2core/minidump-2-core.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/linux/md2core/minidump-2-core.cc b/src/tools/linux/md2core/minidump-2-core.cc
index 6a9e28eb..8cc07a6e 100644
--- a/src/tools/linux/md2core/minidump-2-core.cc
+++ b/src/tools/linux/md2core/minidump-2-core.cc
@@ -46,6 +46,7 @@
#include "common/linux/memory_mapped_file.h"
#include "common/minidump_type_helper.h"
+#include "common/path_helper.h"
#include "common/scoped_ptr.h"
#include "common/using_std_string.h"
#include "google_breakpad/common/breakpad_types.h"
@@ -133,7 +134,7 @@ Usage(int argc, const char* argv[]) {
" lookups to be done in this directory rather than the filesystem\n"
" layout as it exists in the crashing image. This path should end\n"
" with a slash if it's a directory. e.g. /var/lib/breakpad/\n"
- "", basename(argv[0]));
+ "", google_breakpad::BaseName(argv[0]).c_str());
}
static void
@@ -1132,9 +1133,8 @@ AugmentMappings(const Options& options, CrashedProcess* crashinfo,
// Decide whether we use the filename or the SONAME (where the SONAME tends
// to be a symlink to the actual file).
- string basename = options.use_filename ? sig_filename : old_filename;
- size_t slash = basename.find_last_of('/');
- new_filename += basename.substr(slash == string::npos ? 0 : slash + 1);
+ new_filename += google_breakpad::BaseName(
+ options.use_filename ? sig_filename : old_filename);
if (filename != new_filename) {
if (options.verbose) {