Pick up 'egrep' and 'strings' from $PATH instead of using

hardwired absolute path names. People can always arrange $PATH
such that these tools are found.
Fixes BZ #294065. Patch by Austin English <austinenglish@gmail.com>


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15652
This commit is contained in:
Florian Krohm 2015-09-16 08:59:03 +00:00
parent b41e80f228
commit e45be516ed
2 changed files with 3 additions and 2 deletions

1
NEWS
View File

@ -193,6 +193,7 @@ where XXXXXX is the bug number as listed below.
226609 Crediting upstream authors in man page
231257 Valgrind omits path when executing script from shebang line
254164 OS X task_info: UNKNOWN task message [id 3405, to mach_task_self() [..]
294065 Improve the pdb file reader by avoiding hardwired absolute pathnames
269360 s390x: Fix addressing mode selection for compare-and-swap
302630 Memcheck: Assertion failed: 'sizeof(UWord) == sizeof(UInt)'
== 326797

View File

@ -2503,8 +2503,8 @@ HChar* ML_(find_name_of_pdb_file)( const HChar* pename )
sh -c "strings (pename) | egrep '\.pdb$|\.PDB$' > (tmpname)"
*/
const HChar* sh = "/bin/sh";
const HChar* strings = "/usr/bin/strings";
const HChar* egrep = "/usr/bin/egrep";
const HChar* strings = "strings";
const HChar* egrep = "grep -E";
/* (sh) -c "(strings) (pename) | (egrep) 'pdb' > (tmpname) */
Int cmdlen = VG_(strlen)(strings) + VG_(strlen)(pename)