Changeset 8225 in orxonox.OLD

Timestamp:

Jun 8, 2006, 10:32:45 AM (18 years ago)

Author:

bensch

Message:

gui: directory should be safe now

File:

• branches/gui/src/lib/util/directory.cc (modified) (3 diffs)

branches/gui/src/lib/util/directory.cc

@@ -68 +68 @@
 #if not defined(__WIN32__)
   DIR* handle;
-  if (handle != NULL)
-    this->close();
   handle = opendir(this->name().c_str());
   if (!handle)
@@ -78 +76 @@
 #else
   HANDLE handle;
-  if (handle != INVALID_HANDLE_VALUE)
-    this->close();
 
   // First check the attributes trying to access a non-Directory with
@@ -107 +103 @@
   // BUILDING the list of contained Files. (only the names)
 #if not defined(__WIN32__)
-  while (dirent* entry = readdir(handle))
+  dirent* entry;
+  while ((entry = readdir(handle)) != NULL)
     this->_fileNames.push_back(entry->d_name);
   closedir(handle);
 #else
   WIN32_FIND_DATA entry;
-  while (int ok = FindNextFile(handle, &entry))
+  while ((int ok = FindNextFile(handle, &entry)) != 0)
     this->_fileNames.push_back(entry.cFileName);
   FindClose(handle);