Changeset 1419 for trunk/gsdl/lib

Timestamp:

2000-08-17T17:07:43+12:00 (24 years ago)

Author:

sjboddie

Message:

Added collector action - also changed the javascript required by all the
rollover buttons

Location:

trunk/gsdl/lib

Files:

• fileutil.cpp (modified) (3 diffs)
• fileutil.h (modified) (1 diff)

trunk/gsdl/lib/fileutil.cpp

@@ -147 +147 @@
 #include <windows.h>
 
-bool read_dir (const text_t &dirname, text_tarray &filelist) {
+bool directory_exists (const text_t &dirname) {
   
   WIN32_FIND_DATA FileData;  
@@ -155 +155 @@
   
   hSearch = FindFirstFile(dirpath, &FileData); 
-  if (hSearch == INVALID_HANDLE_VALUE) return false;
+  delete dirpath;
+
+  if (hSearch == INVALID_HANDLE_VALUE) {
+    return false;
+  }
+  return true;
+}
+
+bool read_dir (const text_t &dirname, text_tarray &filelist) {
+  
+  WIN32_FIND_DATA FileData;  
+  HANDLE hSearch; 
+  char *dirpath = dirname.getcstr();
+  strcat (dirpath, "\\*");
+  
+  hSearch = FindFirstFile(dirpath, &FileData); 
+  delete dirpath;
+
+  if (hSearch == INVALID_HANDLE_VALUE) {
+    return false;
+  }
   
   text_t filename = FileData.cFileName;
@@ -176 +196 @@
 
 #include <dirent.h>
+
+bool directory_exists (const text_t &dirname) {
+
+  char *tmp = dirname.getcstr();
+  DIR *dirin = opendir (tmp);
+  delete tmp;
+  
+  if (dirin == NULL) return false;
+  closedir (dirin);
+  return true;
+}
 
 bool read_dir (const text_t &dirname, text_tarray &filelist) {

trunk/gsdl/lib/fileutil.h

@@ -44 +44 @@
 bool file_writable (const text_t &filename);
 
+// returns true if directory exists
+bool directory_exists (const text_t &dirname);
+
 bool read_dir (const text_t &dirname, text_tarray &filelist);