Changeset 5018 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Aug 14, 2005, 11:05:01 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: NO MORE SEGFAULT again

Location:

orxonox/trunk/src/lib/util

Files:

• ini_parser.cc (modified) (7 diffs)
• ini_parser.h (modified) (1 diff)

orxonox/trunk/src/lib/util/ini_parser.cc

@@ -40 +40 @@
   this->sections = NULL;
   if (fileName != NULL)
-    this->openFile(fileName);
+    this->readFile(fileName);
 }
 
@@ -91 +91 @@
  * @return true on success false otherwise;
 */
-bool IniParser::openFile(const char* fileName)
+bool IniParser::readFile(const char* fileName)
 {
   FILE*    stream;           //!< The stream we use to read the file.
-
-
   if (sections != NULL)
     deleteSections();
@@ -101 +99 @@
     return false;
 
+  printf("1\n");
   if( (stream = fopen (fileName, "r")) == NULL)
   {
@@ -108 +107 @@
   else
   {
+    printf("2\n");
     this->currentEntry = NULL;
     this->currentSection = NULL;
@@ -119 +119 @@
     char* ptr;
 
-    rewind (stream);
     while( !feof( stream))
     {
       // get next line
       fgets (lineBuffer, PARSELINELENGHT, stream);
+      printf("%s", lineBuffer);
       // remove newline char, and \0-terminate
       if( (ptr = strchr( lineBuffer, '\n')) != NULL)
         *ptr = 0;
       // check for section identifyer
-      if( sscanf (lineBuffer, "[%s", buffer) == 1)
+      if (strlen(lineBuffer) <= 1)
+        printf("empty Line\n");
+      else if( sscanf (lineBuffer, "[%s", buffer) == 1)
       {
         if( (ptr = strchr( buffer, ']')) != NULL)
@@ -137 +139 @@
           strcpy(newSection->name, buffer);
           newSection->entries = new tList<IniEntry>;
+          this->currentSection = newSection;
           this->sections->add(newSection);
-          this->currentSection = newSection;
         }
       }
+      // check for Entry identifier (Entry = Value)
       else if( (ptr = strchr( lineBuffer, '=')) != NULL)
       {
@@ -150 +153 @@
         if( ptr == lineBuffer)
           continue;
-        IniEntry* newEntry = new IniEntry;
-
         char* valueBegin = ptr+1;
         while ((*valueBegin == ' ' || *valueBegin == '\t') && valueBegin <= lineBuffer + strlen(lineBuffer))
           ++valueBegin;
-        newEntry->value = new char[strlen(valueBegin)+1];
-        strcpy(newEntry->value, valueBegin);
-        char* nameEnd = ptr-1, *nameBegin = lineBuffer;
+        char* nameBegin = lineBuffer;
         while ((*nameBegin == ' ' || *nameBegin == '\t') && nameBegin < ptr)
           ++nameBegin;
+        char* nameEnd = ptr-1;
         while ((*nameEnd == ' ' || *nameEnd == '\t' ) && nameEnd >= nameBegin)
           --nameEnd;
         nameEnd[1] = '\0';
-        newEntry->name = new char[strlen (nameBegin)];
+
+        IniEntry* newEntry = new IniEntry;
+        newEntry->value = new char[strlen(valueBegin)+1];
+        strcpy(newEntry->value, valueBegin);
+        newEntry->name = new char[strlen (nameBegin)+1];
         strcpy(newEntry->name, nameBegin);
 

orxonox/trunk/src/lib/util/ini_parser.h

@@ -42 +42 @@
     ~IniParser ();
 
-    bool openFile(const char* name);
+    bool readFile(const char* name);
 
     bool getSection(const char* sectionName);