Changeset 3883 in orxonox.OLD for orxonox/trunk

Timestamp:

Apr 18, 2005, 11:03:16 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now a check for a directory should return true also in Windows

Location:

orxonox/trunk/src/util

Files:

• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (1 diff)

orxonox/trunk/src/util/resource_manager.cc

@@ -39 +39 @@
 {
    this->setClassName ("ResourceManager");
-   this->dataDir = "./";
+   this->dataDir = NULL;
+   this->setDataDir("./");
    this->imageDirs = new tList<char>();
    this->resourceList = new tList<Resource>();
@@ -84 +85 @@
    \param dataDir the DataDirectory.
 */
-bool ResourceManager::setDataDir(char* dataDir)
+bool ResourceManager::setDataDir(const char* dataDir)
 {
   if (isDir(dataDir))
     {
+      delete this->dataDir;
       this->dataDir = new char[strlen(dataDir)+1];
       strcpy(this->dataDir, dataDir);
@@ -93 +95 @@
   else
     {
-      PRINTF(1)("%s is not a Directory, and can not be the Data Directory\n", dataDir);
+      PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
     }
 }
@@ -490 +492 @@
 bool ResourceManager::isDir(const char* directoryName)
 {
+  char* tmpDirName = NULL;
   struct stat status;
-  stat(directoryName, &status);
-  if (status.st_mode & (S_IFDIR 
+
+  // checking for the termination of the string given. If there is a "/" at the end cut it away
+  if (directoryName[strlen(directoryName)-1] == '/')
+    {
+      tmpDirName = new char[strlen(directoryName)+1];
+      strncpy(tmpDirName, directoryName, strlen(directoryName)-1);
+      tmpDirName[strlen(directoryName)-1] = '\0';
+    }
+  else
+    {
+      tmpDirName = new char[strlen(directoryName)+1];
+      strcpy(tmpDirName, directoryName);
+    }
+
+  stat(tmpDirName, &status);
+  if (status.st_mode & (S_IFDIR
 #ifndef __WIN32__
                         | S_IFLNK
 #endif
                         ))
-    return true;
-  else
-    return false;
+    {
+      delete tmpDirName;
+      return true;
+    }
+  else
+    {
+      delete tmpDirName;
+      return false;
+    }
 }
 

orxonox/trunk/src/util/resource_manager.h

@@ -65 +65 @@
   virtual ~ResourceManager();
 
-  bool setDataDir(char* dataDir);
+  bool setDataDir(const char* dataDir);
   bool addImageDir(char* imageDir);
   void* load(const char* fileName, ResourcePriority prio = RP_NO,