b475e4a46a
+ Remove spyblock@gnu.org addon because it causes problems: See: https://github.com/voidlinux/void-packages/issues/2310 and http://lists.gnu.org/archive/html/bug-gnuzilla/2015-07/msg00041.html Closes #2310 Closes #2346
17 lines
717 B
Diff
17 lines
717 B
Diff
--- tools/profiler/LulElf.cpp 2015-07-14 00:10:06.000000000 +0200
|
|
+++ tools/profiler/LulElf.cpp 2015-08-21 14:49:06.100695125 +0200
|
|
@@ -579,10 +579,10 @@
|
|
// Return the non-directory portion of FILENAME: the portion after the
|
|
// last slash, or the whole filename if there are no slashes.
|
|
string BaseFileName(const string &filename) {
|
|
- // Lots of copies! basename's behavior is less than ideal.
|
|
- char *c_filename = strdup(filename.c_str());
|
|
- string base = basename(c_filename);
|
|
- free(c_filename);
|
|
+ // basename's behavior is less than ideal so avoid it
|
|
+ const char *c_filename = filename.c_str();
|
|
+ const char *p = strrchr(c_filename, '/');
|
|
+ string base = p ? p + 1 : c_filename;
|
|
return base;
|
|
}
|
|
|