Changeset 1739 for trunk/gsdl/lib

Timestamp:

2000-12-05T13:08:17+13:00 (23 years ago)

Author:

sjboddie

Message:

A few changes to get multi-volume cd-roms working again

Location:

trunk/gsdl/lib

Files:

• cfgread.cpp (modified) (1 diff)
• fileutil.cpp (modified) (2 diffs)
• fileutil.h (modified) (1 diff)

trunk/gsdl/lib/cfgread.cpp

@@ -49 +49 @@
     filein.get(c);
   }
-  if (key.empty()) return -1;
+  if (key.empty()) return 0; // blank line maybe?
   return 0;
 } 

trunk/gsdl/lib/fileutil.cpp

@@ -170 +170 @@
 }
 
+bool read_dir (const text_t &dirname, text_tset &filelist) {
+  
+  WIN32_FIND_DATA FileData;  
+  HANDLE hSearch; 
+  char *dirpath = dirname.getcstr();
+  strcat (dirpath, "\\*");
+  
+  hSearch = FindFirstFile(dirpath, &FileData); 
+  // freeing this memory can cause a runtime error on some (particularly
+  // debug) versions of VC++
+  delete dirpath;
+  
+  if (hSearch == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+  
+  text_t filename = FileData.cFileName;
+  if (filename != "." && filename != ".." && filename != "CVS")
+    filelist.insert (filename); 
+  
+  while (FindNextFile(hSearch, &FileData)) {
+    filename = FileData.cFileName;
+    if (filename == "." || filename == ".." || filename == "CVS")
+      continue;
+    filelist.insert (filename); 
+  }
+  
+  FindClose(hSearch);
+  
+  return true;
+}
+
 bool read_dir (const text_t &dirname, text_tarray &filelist) {
   
@@ -217 +249 @@
 }
 
+bool read_dir (const text_t &dirname, text_tset &filelist) {
+  
+  char *tmp = dirname.getcstr();
+  DIR *dirin = opendir (tmp);
+  delete tmp;
+  
+  if (dirin == NULL) return false;
+  
+  dirent *dirp; 
+  
+  text_t filename;
+  while ((dirp = readdir (dirin)) != NULL) {
+    filename = dirp->d_name;
+    if (filename == "." || filename == ".." || filename == "CVS")
+      continue;
+    filelist.insert (filename);
+  }
+  closedir (dirin);
+  return true;
+}
+
 bool read_dir (const text_t &dirname, text_tarray &filelist) {
-  
-  filelist.erase (filelist.begin(), filelist.end());
   
   char *tmp = dirname.getcstr();

trunk/gsdl/lib/fileutil.h

@@ -49 +49 @@
 bool directory_exists (const text_t &dirname);
 
+// note that read_dir appends to filelist, it doesn't clear
+// it first
 bool read_dir (const text_t &dirname, text_tarray &filelist);
+bool read_dir (const text_t &dirname, text_tset &filelist);
 
 bool file_copy (const text_t &fromfile, const text_t &tofile);