Changeset 5126 in orxonox.OLD for trunk/src/util/shell.cc

Timestamp:

Aug 25, 2005, 3:17:53 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the shell is now able to handle newLines

File:

• trunk/src/util/shell.cc (modified) (2 diffs)

trunk/src/util/shell.cc

@@ -258 +258 @@
    vsprintf(this->bufferArray, line, arguments);
 
-   char* newLine = new char[strlen(this->bufferArray)+1];
-   strcpy(newLine, this->bufferArray);
-
-   this->buffer->add(newLine);
-
-   if (this->buffer->getSize() > this->bufferSize)
+   unsigned int inputLength = strlen(this->bufferArray);
+   char* newLineBegin = this->bufferArray;
+   char* newLineEnd;
+
+   while (newLineBegin < this->bufferArray + inputLength)
    {
-     delete this->buffer->firstElement();
-     this->buffer->remove(this->buffer->firstElement());
-   }
-
-   if (this->bActive)
-   {
-     this->printToDisplayBuffer(newLine);
+     newLineEnd = strchr(newLineBegin, '\n');
+     if (newLineEnd != NULL && *newLineEnd == '\n')
+       *newLineEnd = '\0';
+     else
+       break;
+
+     char* addLine = new char[strlen(newLineBegin)+1];
+     strcpy(addLine, newLineBegin);
+
+     this->buffer->add(addLine);
+
+     if (this->buffer->getSize() > this->bufferSize)
+     {
+       delete this->buffer->firstElement();
+       this->buffer->remove(this->buffer->firstElement());
+     }
+
+     if (this->bActive)
+     {
+       this->printToDisplayBuffer(addLine);
+     }
+     newLineBegin = newLineEnd+1;
    }
 }
@@ -410 +424 @@
   {
     this->flushBuffers();
+    this->addBufferLine("orxonox - shell\n ==================== \n", NULL);
   }