Changeset 9372 in orxonox.OLD

Timestamp:

Jul 20, 2006, 11:44:25 PM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: fixed a bug, that prevented empty shell-completions

File:

• branches/proxy/src/lib/shell/shell_command.cc (modified) (5 diffs)

branches/proxy/src/lib/shell/shell_command.cc

@@ -119 +119 @@
 
     CmdList::const_iterator elem;
-    for (elem = cmdClass->commandList.begin(); elem != cmdClass->commandList.end(); elem++)
-      if (commandName == (*elem)->getName())
-        return (*elem);
+    for (unsigned int i = 0; i < cmdClass->commandList.size(); i++)
+    {
+      if (commandName == cmdClass->commandList[i]->getName())
+        return (cmdClass->commandList[i]);
+    }
     return NULL;
   }
@@ -137 +139 @@
     if (likely(checkClass != NULL))
       return ShellCommand::getCommand(commandName, checkClass);
-    return NULL;
+    else
+      return NULL;
   }
 
@@ -149 +152 @@
   const ShellCommand* const ShellCommand::getCommandFromInput(const std::string& inputLine, unsigned int& paramBegin, std::vector<BaseObject*>* boList)
   {
-    return ShellCommand::getCommandFromInput(SubString(inputLine, SubString::WhiteSpaces), paramBegin);
+    return ShellCommand::getCommandFromInput(SubString(inputLine, SubString::WhiteSpaces), paramBegin, boList);
   }
 
@@ -199 +202 @@
       {
         // Search for Objects.
-        retCmd = ShellCommand::getCommand(strings[1], cmdClass);
+        retCmd = ShellCommand::getCommand((strings.size() > 1) ? strings[1] : "", cmdClass);
         if (retCmd != NULL)
         {
@@ -210 +213 @@
       if (retCmd == NULL && strings.size() >= 2)
       {
-        retCmd = ShellCommand::getCommand(strings[2], cmdClass);
+        retCmd = ShellCommand::getCommand((strings.size() > 2) ? strings[2] : "", cmdClass);
         if (retCmd != NULL)
         {