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>
This commit is contained in:
Tobias Sargeant 2017-10-18 16:39:09 +01:00 committed by Tobias Sargeant
parent 9b23ca3a7c
commit 072f86ca83
10 changed files with 220 additions and 31 deletions

View file

@ -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) {