commit d033e1cef5516d77f3712dd6d826153101c91507
author Enrico Granata <egranata@apple.com> Wed Mar 23 01:21:55 2016 +0000
committer Enrico Granata <egranata@apple.com> Wed Mar 23 01:21:55 2016 +0000
tree 278dbe77addd6730b25dae0e89fa7dcbeb1ffdcf
parent 1a911e204d4a9258d11ba6f61fd698f1a0a8a7d2

Change 'apropos' such that it doesn't look into the "long help/syntax" strings for commands

This solves issues such as 'apropos foo' returning valid matches just because syntax examples happen to use 'foo' as a placeholder token

Fixes rdar://9043025

llvm-svn: 264123

lldb/source/Interpreter/CommandObject.cpp

diff --git a/lldb/source/Interpreter/CommandObject.cpp b/lldb/source/Interpreter/CommandObject.cpp
index d8c1084..fed19d7 100644
--- a/lldb/source/Interpreter/CommandObject.cpp
+++ b/lldb/source/Interpreter/CommandObject.cpp
@@ -411,7 +411,11 @@
 }
 
 bool
-CommandObject::HelpTextContainsWord (const char *search_word)
+CommandObject::HelpTextContainsWord (const char *search_word,
+                                     bool search_short_help,
+                                     bool search_long_help,
+                                     bool search_syntax,
+                                     bool search_options)
 {
     std::string options_usage_help;
 
@@ -421,14 +425,15 @@
     const char *long_help = GetHelpLong();
     const char *syntax_help = GetSyntax();
     
-    if (short_help && strcasestr (short_help, search_word))
+    if (search_short_help && short_help && strcasestr (short_help, search_word))
         found_word = true;
-    else if (long_help && strcasestr (long_help, search_word))
+    else if (search_long_help && long_help && strcasestr (long_help, search_word))
         found_word = true;
-    else if (syntax_help && strcasestr (syntax_help, search_word))
+    else if (search_syntax && syntax_help && strcasestr (syntax_help, search_word))
         found_word = true;
 
     if (!found_word
+        && search_options
         && GetOptions() != nullptr)
     {
         StreamString usage_help;