Changeset 7771 in orxonox.OLD

Timestamp:

May 23, 2006, 2:19:54 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: Fixed a Bug in the Shell Exection, that compromised a Vector

Location:

trunk/src/lib/shell

Files:

• shell_command.cc (modified) (2 diffs)
• shell_input.cc (modified) (1 diff)

trunk/src/lib/shell/shell_command.cc

@@ -185 +185 @@
             fillObjectList("", (*alias)->getCommand(), boList);
         }
+        paramBegin = 1;
         return (*alias)->getCommand();
       }
@@ -290 +291 @@
 
     unsigned int paramBegin;
-    const ShellCommand* sc;
+    const ShellCommand* sc = NULL;
     std::vector<BaseObject*> boList;
     sc = getCommandFromInput(inputSplits, paramBegin, &boList);
     if (sc != NULL)
     {
-      PRINT(0)("Command %s on ", sc->getName());
       for(std::vector<BaseObject*>::const_iterator bo = boList.begin(); bo != boList.end(); ++bo)
       {
-        PRINT(0)("%s::%s\n", (*bo)->getClassName(), (*bo)->getName());
-        (*sc->executor)((*bo), inputSplits.getSubSet(paramBegin).join());
+        PRINT(0)("Command '%s' on '%s::%s'\n", sc->getName(), (*bo)->getClassName(), (*bo)->getName());
+        (*sc->executor)((*bo), inputSplits.getSubSet(paramBegin));
       }
       return true;

trunk/src/lib/shell/shell_input.cc

@@ -175 +175 @@
 
     // adding the new Command to the History
-    if (history.back() != this->inputLine)
+    if (history.empty() || history.back() != this->inputLine)
       this->history.push_back(this->inputLine);
     if (this->history.size() > this->historyLength)