Changeset 1456 for trunk/gsdl/lib

Timestamp:

2000-08-27T23:08:31+12:00 (24 years ago)

Author:

stefan

Message:

Support for collectoraction

Location:

trunk/gsdl/lib

Files:

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

trunk/gsdl/lib/fileutil.cpp

@@ -56 +56 @@
     here++;
     path1.erase(here,path1.end());
-
+    
     // add one final slash
 #ifdef __WIN32__
@@ -74 +74 @@
   
   text_t fullpath = path1 + path2;
-
+  
   // make sure all the right slashes are used
   here = fullpath.begin();
@@ -103 +103 @@
 }
 
+text_t filename_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5, text_t path6) {
+  return filename_cat(filename_cat(path1,path2,path3,path4,path5),path6);
+}
+
 // returns true if filename can be opened
 bool file_exists (const text_t &filename) {
@@ -112 +117 @@
 #endif
   delete cstr;
-
+  
   if (filestream) {
     // file exists
@@ -118 +123 @@
     return true;
   }
-
+  
   // file does not exist
   return false;
@@ -132 +137 @@
 #endif
   delete cstr;
-
+  
   if (filestream) {
     // file exists
@@ -138 +143 @@
     return true;
   }
-
+  
   // file does not exist
   return false;
@@ -156 +161 @@
   hSearch = FindFirstFile(dirpath, &FileData); 
   delete dirpath;
-
+  
   if (hSearch == INVALID_HANDLE_VALUE) {
     return false;
@@ -172 +177 @@
   hSearch = FindFirstFile(dirpath, &FileData); 
   delete dirpath;
-
+  
   if (hSearch == INVALID_HANDLE_VALUE) {
     return false;
@@ -198 +203 @@
 
 bool directory_exists (const text_t &dirname) {
-
+  
   char *tmp = dirname.getcstr();
   DIR *dirin = opendir (tmp);
@@ -209 +214 @@
 
 bool read_dir (const text_t &dirname, text_tarray &filelist) {
-
+  
   filelist.erase (filelist.begin(), filelist.end());
   
@@ -219 +224 @@
   
   dirent *dirp; 
-
+  
   text_t filename;
   while ((dirp = readdir (dirin)) != NULL) {
@@ -234 +239 @@
 
 // I'm sure there's a better way to do this - for now I don't have 
-// time to find it though. -- This will probably break compiling 
-// under windows ports of gcc
-void file_copy (const text_t &fromfile, const text_t &tofile) {
-
-#ifdef __WIN32__
+// time to find it though
+// returns true if things look like they happened ok
+bool file_copy (const text_t &fromfile, const text_t &tofile) {
+  
   char *fromfilec = fromfile.getcstr();
   char *tofilec = tofile.getcstr();
-  CopyFile (fromfilec, tofilec, FALSE);
+  bool fail = false;
+  ifstream from (fromfilec);
+  if (!from) {
+    fail = true;
+  } else {
+    ofstream to (tofilec);
+    if (!to) {
+      fail = true;
+      from.close();
+    } else {
+      char c;
+      from.get(c);
+      while (!from.eof ()) {
+    to.put(c);
+    from.get(c);
+      }
+      from.close();
+      to.close();
+    }
+  }
   delete fromfilec;
   delete tofilec;
-  
-#else
-  text_t cp_cmd = "cp " + fromfile + " " + tofile;
-  char *cp_cmdc = cp_cmd.getcstr();
-  system (cp_cmdc);
-  delete cp_cmdc;
-  
-#endif
-}
+  if (fail) return false;
+  return true;
+}
+
+/*
+
+#ifdef __WIN32__
+char *fromfilec = fromfile.getcstr();
+char *tofilec = tofile.getcstr();
+CopyFile (fromfilec, tofilec, FALSE);
+delete fromfilec;
+delete tofilec;
+
+#else
+text_t cp_cmd = "cp " + fromfile + " " + tofile;
+char *cp_cmdc = cp_cmd.getcstr();
+system (cp_cmdc);
+delete cp_cmdc;
+
+#endif
+*/
 
 // returns the last line (or last 256 characters)
@@ -258 +293 @@
 text_t file_tail (const text_t &filename) {
 
-  text_t return_str;
+  text_t return_str, tmpstr;
   char *filenamec = filename.getcstr();
+  char linec[256];
+
 
   ifstream file_in (filenamec);
+  delete filenamec;
   if (file_in) {
     file_in.seekg (-256, ios::end);
-    char c;
-    file_in.get(c);
-    while (!file_in.eof()) {
-      if (c == '\n') {
-    file_in.get(c);
-    if (!file_in.eof()) {
-      return_str.clear();
-      if (c == '\\') return_str.push_back ('\\');
-      return_str.push_back (c);
-    }
-      } else {
-    if (c == '\\') return_str.push_back ('\\');
-    return_str.push_back (c);
-      }
-      file_in.get(c);
+    file_in.getline (linec, 256, EOF);
+    file_in.close();
+
+    tmpstr.setcstr (linec);
+    text_t::const_iterator here = tmpstr.begin();
+    text_t::const_iterator end = tmpstr.end();
+    while (here != end) {
+      // handle trailing carriage returns
+      while (*here == '\n') {
+    here++;
+    if (here == end) return return_str;
+    else if (*here != '\n') return_str.clear();
+      } 
+      if (*here == '\\') return_str.push_back ('\\');
+      return_str.push_back (*here);
+      here ++;
     }
-    file_in.close();
-
-  }
-  delete filenamec;
+  }
   return return_str;
 }
+
+// probably need windows version of this
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+// returns true if directory was created successfully
+bool mk_dir (const text_t &dirname) {
+  mode_t mode = 0777;
+  char *dirnamec = dirname.getcstr();
+  int rv = mkdir (dirnamec, mode);
+  delete dirnamec;
+  if (rv == 0) return true;
+  return false;
+}
+

trunk/gsdl/lib/fileutil.h

@@ -37 +37 @@
 text_t filename_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
              text_t path5);
+text_t filename_cat (text_t path1, text_t path2, text_t path3, text_t path4, 
+             text_t path5, text_t path6);
 
 // returns true if filename can be opened
@@ -49 +51 @@
 bool read_dir (const text_t &dirname, text_tarray &filelist);
 
-void file_copy (const text_t &fromfile, const text_t &tofile);
+bool file_copy (const text_t &fromfile, const text_t &tofile);
 
 text_t file_tail (const text_t &filename);
 
+// returns true if directory created successfully
+bool mk_dir (const text_t &dirname);
+
 #endif

trunk/gsdl/lib/gsdltools.cpp

@@ -84 +84 @@
 }
 
+#else
+void gsdl_system (char *cmd, ostream &logout) {
+
+  if (cmd == NULL) return;
+  int pid = fork();
+  if (pid == -1) return;
+  if (pid == 0) {
+    // child process
+    char *argv[4];
+    argv[0] = "sh";
+    argv[1] = "-c";
+    argv[2] = cmd;
+    argv[3] = 0;
+    execv("/bin/sh", argv);
+    //    exit(127);
+  }
+}
+
 #endif

trunk/gsdl/lib/gsdltools.h

@@ -50 +50 @@
 // system call and putting the spawned process in the background
 // (e.g. system (funcname options &);
-#if defined (__WIN32__)
+//#if defined (__WIN32__)
 void gsdl_system (char *cmd, ostream &logout);
-#endif
+//#endif
 
 #endif