Changeset 5135 in orxonox.OLD for trunk/src/util/shell_command.cc

Timestamp:

Aug 26, 2005, 12:51:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: it is now possible to execute Commands registered to the ShellCommandBase with no arguments

File:

• trunk/src/util/shell_command.cc (modified) (4 diffs)

trunk/src/util/shell_command.cc

@@ -28 +28 @@
 using namespace std;
 
-ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID, void* functionPointer, unsigned int paramCount, va_list parameters)
+ShellCommandBase::ShellCommandBase(const char* commandName, ClassID classID, unsigned int paramCount, ...)
 {
+  va_list parameters;
+  va_start(parameters, paramCount);
+
   this->classID = classID;
-  this->functionPointer = functionPointer;
   this->commandName = new char[strlen(commandName)+1];
   strcpy(this->commandName, commandName);
@@ -37 +39 @@
   // handling parameters, and storing them:
   this->paramCount = paramCount;
-  this->parameters = new ShellParameterType[paramCount];
+  this->parameters = new ParameterType[paramCount];
 
   for (unsigned int i = 0; i < paramCount; i++)
@@ -55 +57 @@
 tList<ShellCommandBase>* ShellCommandBase::commandList = NULL;
 
-bool ShellCommandBase::isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, va_list parameters)
+bool ShellCommandBase::isRegistered(const char* commandName, ClassID classID, unsigned int paramCount, ...)
 {
+
+  va_list parameters;
+  va_start(parameters, paramCount);
+
   if (ShellCommandBase::commandList == NULL)
   {
@@ -80 +86 @@
 
 
+bool ShellCommandBase::execute(const char* executionString)
+{
+  if (ShellCommandBase::commandList == NULL)
+    return false;
+
+  const char* commandEnd = strchr(executionString, ' ');
+  if (commandEnd == NULL)
+    commandEnd = executionString + strlen(executionString);
+
+  tIterator<ShellCommandBase>* iterator = ShellCommandBase::commandList->getIterator();
+  ShellCommandBase* elem = iterator->firstElement();
+  while(elem != NULL)
+  {
+    if (!strncmp(executionString, elem->commandName, commandEnd - executionString))
+    {
+      elem->executeCommand(commandEnd);
+      delete iterator;
+      return true;
+    }
+    elem = iterator->nextElement();
+  }
+  delete iterator;
+  return true;
+}
+