Changeset 1279 for branches/New_Config_Format-branch/gsdl/lib/fileutil.cpp

Timestamp:

2000-07-13T10:21:53+12:00 (24 years ago)

Author:

sjboddie

Message:

merged changes to trunk into New_Config_Format branch

File:

• branches/New_Config_Format-branch/gsdl/lib/fileutil.cpp (modified) (5 diffs)

branches/New_Config_Format-branch/gsdl/lib/fileutil.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.14.2.1  2000/07/12 22:20:54  sjboddie
+   merged changes to trunk into New_Config_Format branch
+
+   Revision 1.16  2000/05/12 03:09:22  sjboddie
+   minor modifications to get web library compiling under VC++ 6.0
+
+   Revision 1.15  2000/05/04 08:27:28  sjboddie
+   modifications for windows ports of GCC
+
    Revision 1.14  2000/04/06 19:57:59  cs025
    Correcting a correction - reinstated all lib files due to silly
@@ -118 +127 @@
   path2.erase (path2.begin(), here);
   
-  // return the concatenation of the two strings
-  return path1 + path2;
+  text_t fullpath = path1 + path2;
+
+  // make sure all the right slashes are used
+  here = fullpath.begin();
+  end = fullpath.end();
+  while (here != end) {
+#ifdef __WIN32__
+    if (*here == '/') *here = '\\';
+#else
+    if (*here == '\\') *here = '/';
+#endif
+    here ++;
+  }
+  return fullpath;
 }
 
@@ -139 +160 @@
 bool file_exists (const text_t &filename) {
   char *cstr = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
   ifstream filestream (cstr, ios::in | ios::nocreate);
+#else
+  ifstream filestream (cstr, ios::in);
+#endif
   delete cstr;
 
@@ -155 +180 @@
 bool file_writable (const text_t &filename) {
   char *cstr = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
   ifstream filestream (cstr, ios::out | ios::nocreate);
+#else
+  ifstream filestream (cstr, ios::out);
+#endif
   delete cstr;
 
@@ -168 +197 @@
 }
 
-#if defined __WIN32__
+#if defined(__WIN32__) && !defined(__GNUC__)
 
 #include <windows.h>
 
-BOOL read_dir (const text_t &dirname, text_tarray &filelist) {
+bool read_dir (const text_t &dirname, text_tarray &filelist) {
   
   WIN32_FIND_DATA FileData;  
   HANDLE hSearch; 
-  DWORD dwAttrs; 
   char *dirpath = dirname.getcstr();
   strcat (dirpath, "\\*");
-
-  BOOL finished = false; 
   
   hSearch = FindFirstFile(dirpath, &FileData);