PR14297 cont'd: find wildcards more carefully for stap -l filtering

* elaborate.cxx (derived_probe::script_location): Look for other
  glob characters too in to-be-skipped items in the derivation chain.

diff --git a/elaborate.cxx b/elaborate.cxx
index c74b1870a0b565f2919fc41d1c3fb2878000ddcc..efae1666eacc21202c18d0732a89116bc83a8d4a 100644 (file)
--- a/elaborate.cxx
+++ b/elaborate.cxx
@@ -165,8 +165,12 @@ derived_probe::script_location () const
 
   for (int i=chain.size()-1; i>=0; i--)
     {
-      string pp_printed = lex_cast(* chain[i]);
-      if (pp_printed.find('*') == string::npos)
+      probe_point pp_copy (* chain [i]);
+      // drop any ?/! denotations that would confuse a glob-char search
+      pp_copy.optional = false;
+      pp_copy.sufficient = false;
+      string pp_printed = lex_cast(pp_copy);
+      if (! contains_glob_chars(pp_printed))
         return chain[i];
     }