Changeset 7204 in orxonox.OLD

Timestamp:

Mar 9, 2006, 6:10:22 PM (18 years ago)

Author:

bensch

Message:

small bug… more to come :/

Location:

branches/std/src/lib

Files:

• gui/gtk_gui/gui_exec.cc (modified) (1 diff)
• parser/ini_parser/ini_parser.cc (modified) (5 diffs)
• util/loading/resource_manager.cc (modified) (3 diffs)

branches/std/src/lib/gui/gtk_gui/gui_exec.cc

@@ -166 +166 @@
 void GuiExec::setConfFile(const char* fileName)
 {
-  if (!this->confDir.empty())
+  if (this->confDir.empty())
     this->setConfDir("~/");
   this->confFile = this->confDir + "/" + fileName;

branches/std/src/lib/parser/ini_parser/ini_parser.cc

@@ -68 +68 @@
 {
   // in all sections
-  while(!this->sections.empty())
-  {
-    IniSection section = this->sections.front();
-
-    // in all entries of the sections
-    while(!section.entries.empty())
-    {
-      // delete all strings of entries.
-      IniEntry entry = section.entries.front();
-      section.entries.pop_front();
-    }
-    // delete all Sections
-    this->sections.pop_front();
-  }
+  this->sections.clear();
+
   this->currentSection = this->sections.end();
   this->setFileName(NULL);
@@ -95 +83 @@
 {
   this->comment = "";
-
-  if (!fileName.empty())
-    this->fileName = fileName;
-  else
-    this->fileName = "";
+  this->fileName = fileName;
 }
 
@@ -118 +102 @@
   if (!this->fileName.empty())
     this->deleteSections();
+
   if( fileName.empty())
     return false;
@@ -151 +136 @@
       if ( (*lineBegin == '#' || *lineBegin == ';'))
       {
-        char* newCommenLine = new char[strlen(lineBegin)+1];
-        strcpy(newCommenLine, lineBegin);
+        string newCommenLine = lineBegin;
         this->commentList.push_back(newCommenLine);
         continue;
@@ -276 +260 @@
   if (!this->sections.empty())
     this->currentEntry = (*this->currentSection).entries.begin();
-  PRINTF(5)("Added Section %s\n", sectionName);
+  PRINTF(5)("Added Section %s\n", sectionName.c_str());
   return true;
 }

branches/std/src/lib/util/loading/resource_manager.cc

@@ -59 +59 @@
   this->setName("ResourceManager");
 
-  this->dataDir = new char[3];
   this->dataDir = "./";
+  this->_cwd = "";
   this->tryDataDir("./data");
 }
@@ -789 +789 @@
 bool ResourceManager::isFile(const std::string& fileName)
 {
+  if (fileName.empty())
+    return false;
   std::string tmpFileName = ResourceManager::homeDirCheck(fileName);
   // actually checks the File
@@ -840 +842 @@
  * @param name the Name of the file to check
  * @returns The name of the file, including the HomeDir
- * IMPORTANT: this has to be deleted from the outside
  */
 std::string ResourceManager::homeDirCheck(const std::string& name)
 {
-  std::string retName;
-  if (!strncmp(name.c_str(), "~/", 2))
-  {
-    char tmpFileName[500];
+  if (name.size() >= 2 && name[0] == '~' && name[1] == '/')
+  {
+    std::string homeDir;
+    std::string newName = name.substr(1, name.size()-1);
 #ifdef __WIN32__
-    strcpy(tmpFileName, getenv("USERPROFILE"));
+    homeDir = getenv("USERPROFILE");
 #else
-    strcpy(tmpFileName, getenv("HOME"));
-#endif
-    retName = tmpFileName + name;
-  }
-  else
-  {
-    retName = name;
-  }
-  return retName;
+    homeDir = getenv("HOME");
+#endif
+    return homeDir + newName;
+  }
+  else
+    return name;
 }