From: Florian Krohm <florian@eich-krohm.de>
Date: Wed, 16 Sep 2015 08:59:03 +0000 (+0000)
Subject: Pick up 'egrep' and 'strings' from $PATH instead of using
X-Git-Tag: svn/VALGRIND_3_12_0~356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e45be516ed52f850ec3952fe1efaed5e6ddb2ce0;p=thirdparty%2Fvalgrind.git

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
---

diff --git a/NEWS b/NEWS
index 7119ab8b8d..872a56011e 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/coregrind/m_debuginfo/readpdb.c b/coregrind/m_debuginfo/readpdb.c
index 08a9f56819..8b63e9562e 100644
--- a/coregrind/m_debuginfo/readpdb.c
+++ b/coregrind/m_debuginfo/readpdb.c
@@ -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)