Changeset 1769

Timestamp:

May 20, 2005, 2:28:01 AM (16 years ago)

Author:

orlov

Message:

• Fixes in Windows version.

Location:

to-imperative/trunk/library/Dir

Files:

• dir.hh (modified) (1 diff)
• dir.ih (modified) (2 diffs)
• dir_symbol.hh (modified) (1 diff)
• open_dir_win.cc (deleted)

to-imperative/trunk/library/Dir/dir.hh

@@ -23 +23 @@
 #else
   HANDLE hDir;
+  WIN32_FIND_DATA fd;
+  bool is_first;
 #endif
 

to-imperative/trunk/library/Dir/dir.ih

@@ -20 +20 @@
 }
 #else
-inline Dir::Dir (const char* _name)
+inline Dir::Dir (const char* _name) :
+  is_first (true)
 {
   char name [MAX_PATH];
-  WIN32_FIND_DATA* pfd;
   if (snprintf(name, MAX_PATH, "%s\\*", _name) < 0)
     throw_sys_error(ERROR_FILENAME_EXCED_RANGE);
-  hDir = FindFirstFile(name, pfd);
+  hDir = FindFirstFile(name, &fd);
   if (hDir == INVALID_HANDLE_VALUE)
     throw_sys_error(GetLastError());
@@ -53 +53 @@
 inline char* Dir::read() 
 {
-  if (hDir) return null;
-  WIN32_FIND_DATA* pfd;
-  if(!FindNextFile(hDir, pfd))
+  if (!hDir) return null;
+  if (is_first)
   {
-    DWORD error = GetLastError();
-    if (error != ERROR_NO_MORE_FILES) throw_sys_error(error);
-    return null;
+    is_first = false;
   }
-  return (pfd->cFileName);
+  else
+  {
+    if (!FindNextFile(hDir, &fd))
+    {
+      DWORD error = GetLastError();
+      if (error != ERROR_NO_MORE_FILES) throw_sys_error(error);
+      return null;
+    }
+  }
+  return fd.cFileName;
 }
 #endif

to-imperative/trunk/library/Dir/dir_symbol.hh

@@ -13 +13 @@
 {
 
-RF_NEW_SYMBOL(Dir, object_term);
+RF_NEW_SYMBOL(Dir, ObjectTerm);
 
 inline pxx::WString RF_SYMBOL(Dir)::to_string (RF_SYMBOL(Dir) const* _dir)