Changeset 8145 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

Location:

trunk/src/lib/shell

Files:

• shell_buffer.cc (modified) (4 diffs)
• shell_buffer.h (modified) (3 diffs)
• shell_command.h (modified) (1 diff)

trunk/src/lib/shell/shell_buffer.cc

@@ -41 +41 @@
   ShellBuffer* ShellBuffer::singletonRef = NULL;
   std::list<std::string> ShellBuffer::buffer;
+  char ShellBuffer::bufferArray[SHELL_BUFFER_SIZE];
+
 
   /**
@@ -62 +64 @@
    * @param line the Line as in the first argument in printf
    */
-  bool ShellBuffer::addBufferLineStatic(const char* line, ...)
+  void ShellBuffer::addBufferLineStatic(const char* line, ...)
   {
-    va_list arguments;
-    va_start(arguments, line);
-
     static OrxThread::Mutex ShellBuffer__bufferMutex;
 
     OrxThread::MutexLock bufferLock(&ShellBuffer__bufferMutex);
+
+    va_list arguments;
+    va_start(arguments, line);
+    vsnprintf(ShellBuffer::bufferArray, SHELL_BUFFER_SIZE, line, arguments);
+    va_end(arguments);
+
 #if DEBUG_LEVEL < 3
     if (ShellBuffer::singletonRef == NULL)
 #endif
-      vprintf(line, arguments);
+      printf(ShellBuffer::bufferArray);
 #if DEBUG_LEVEL < 3
     else
@@ -79 +84 @@
     if (ShellBuffer::singletonRef != NULL)
 #endif
-      ShellBuffer::singletonRef->addBufferLine(line, arguments);
-    return true;
+      ShellBuffer::singletonRef->addBufferLine(ShellBuffer::bufferArray);
   }
 
@@ -91 +95 @@
    * and displays the line as the First Line of the display-buffer
    */
-  void ShellBuffer::addBufferLine(const char* line, va_list arguments)
+  void ShellBuffer::addBufferLine(const char* line)
   {
-    // copy the output to the bufferArray
-    vsprintf(this->bufferArray, line, arguments);
-
-    std::string inputBuffer = this->keepBuffer + this->bufferArray;
+    std::string inputBuffer = this->keepBuffer + line;
 
     int lineBegin = 0;

trunk/src/lib/shell/shell_buffer.h

@@ -32 +32 @@
     inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
 
-    static bool addBufferLineStatic(const char* line, ...);
-    void addBufferLine(const char* line, va_list arg);
+    static void addBufferLineStatic(const char* line, ...);
+    void addBufferLine(const char* line);
 
     /// BUFFER
@@ -56 +56 @@
     unsigned int                  maxBufferSize;                         //!< The Size of the buffer
 
-    char                          bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
     std::string                   keepBuffer;                         //!< a BUFFER to have multi-non-newLine commands be copied into the shell.
 
@@ -62 +61 @@
 
     // The Beginning of buffer (buffer.front()) is the last added line.
+    static char                   bufferArray[SHELL_BUFFER_SIZE];     //!< a BUFFER for fast writing
     static std::list<std::string> buffer;                             //!< A list of stored char-arrays(strings) to store the history
   };

trunk/src/lib/shell/shell_command.h

@@ -34 +34 @@
    * $ ClassName [ObjectName] commandNameInShell [parameters]
    */
-  //#define SHELL_COMMAND(command, class, function) \
-  //        ShellCommand* shell_command_##class##_##command = ShellCommand<class>::registerCommand(#command, #class, &class::function)
 #define SHELL_COMMAND(command, class, function) \
            OrxShell::ShellCommand* shell_command_##class##_##command = OrxShell::ShellCommand::registerCommand(#command, #class, createExecutor<class>(&class::function))