commit 2a58815ee3db47f55282a6661fe0b08034355990
author Davide Pesavento <davide.pesavento@lip6.fr> Mon Feb 19 18:10:03 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Tue Feb 20 21:34:00 2018 -0500
tree 07d2bac9ab61a992f19face9d67407405204aa7d
parent 3f94ec31f3ea3d88e6d3b9d6454b22a00d9b9aff

tools: extend nfdc help to cover more cases

Change-Id: I0cd182c8635b15c8ffb750c913e14fa99e595d45
Refs: #4503

tools/nfdc/command-parser.cpp

diff --git a/tools/nfdc/command-parser.cpp b/tools/nfdc/command-parser.cpp
index 74ecf36..59c4912 100644
--- a/tools/nfdc/command-parser.cpp
+++ b/tools/nfdc/command-parser.cpp
@@ -108,7 +108,7 @@
 }
 
 std::tuple<std::string, std::string, CommandArguments, ExecuteCommand>
-CommandParser::parse(std::vector<std::string> tokens, ParseMode mode) const
+CommandParser::parse(const std::vector<std::string>& tokens, ParseMode mode) const
 {
   BOOST_ASSERT(mode == ParseMode::ONE_SHOT);
 
@@ -130,20 +130,6 @@
       i = m_commands.find({noun, ""});
     }
     nameLen = std::min<size_t>(1, tokens.size());
-
-    if (i == m_commands.end()) {
-      const auto helpStrings = {"help", "--help", "-h"};
-      auto helpIt = std::find_first_of(tokens.begin(), tokens.end(),
-                                       helpStrings.begin(), helpStrings.end());
-      if (helpIt != tokens.end()) {
-        NDN_LOG_TRACE("fallback to noun=help verb=");
-        i = m_commands.find({"help", ""});
-        if (i != m_commands.end()) {
-          tokens.erase(helpIt);
-          nameLen = 0;
-        }
-      }
-    }
   }
 
   if (i == m_commands.end() || (i->second->modes & static_cast<AvailableIn>(mode)) == 0) {