Changeset 7425 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Apr 28, 2006, 6:05:02 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: should compile on Windows goin to check this today

File:

• trunk/src/lib/util/osdir.h (modified) (5 diffs)

trunk/src/lib/util/osdir.h

@@ -129 +129 @@
   {
     public:
-      Directory(const std::string& aName)
-          : handle(INVALID_HANDLE_VALUE), willfail(false)
-      {
+      Directory(const std::string& directoryName = "")
+          : handle(INVALID_HANDLE_VALUE), willfail(true)
+      {
+        this->open(directoryName);
+      }
+
+      ~Directory()
+      {
+          this->close
+      }
+
+      bool open(const std::string& directoryName)
+      {
+        if (handle != INVALID_HANDLE_VALUE)
+          this->close();
+
         // First check the attributes trying to access a non-Directory with
         // FindFirstFile takes ages
-        DWORD attrs = GetFileAttributes(aName.c_str());
+        DWORD attrs = GetFileAttributes(directoryName.c_str());
         if ( (attrs == 0xFFFFFFFF) || ((attrs && FILE_ATTRIBUTE_DIRECTORY) == 0) )
         {
@@ -140 +153 @@
           return;
         }
-        std::string Full(aName);
+        std::string Full(directoryName);
         // Circumvent a problem in FindFirstFile with c:\\* as parameter
         if ( (Full.length() > 0) && (Full[Full.length()-1] != '\\') )
@@ -151 +164 @@
           current = entry.cFileName;
       }
-      ~Directory()
+
+      void close()
       {
         if (handle != INVALID_HANDLE_VALUE)
           FindClose(handle);
+        this->willfail = true;
       }
 
@@ -161 +176 @@
         return willfail ? (void*)0:(void*)(-1);
       }
+
       std::string next()
       {
@@ -172 +188 @@
         return current;
       }
+
+
     private:
       HANDLE    handle;