Changeset 7204 in orxonox.OLD for branches/std/src/lib/util

Timestamp:

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

Author:

bensch

Message:

small bug… more to come :/

File:

• branches/std/src/lib/util/loading/resource_manager.cc (modified) (3 diffs)

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;
 }