Changeset 1485 for trunk/gsdl/lib

Timestamp:

2000-08-31T20:07:53+12:00 (24 years ago)

Author:

sjboddie

Message:

More improvements to collector

Location:

trunk/gsdl/lib

Files:

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

trunk/gsdl/lib/fileutil.cpp

@@ -280 +280 @@
 }
 
-// returns the last line (or last 256 characters)
-// of filename file
+
+text_t file_tail (const text_t &filename, int numlines) {
+  if (numlines < 1) numlines = 1;
+  int numchars = 256*numlines;
+
+  text_tarray lines;
+  text_t ret;
+
+  char *filenamec = filename.getcstr();
+  char linec[256];
+  ifstream file_in (filenamec);
+  delete filenamec;
+  if (file_in) {
+
+    // this should be here to keep things reasonably fast
+    // when there's a long file to tail but I can't work out 
+    // how to tell when it's rewound past the beginning of the file 
+    // (which causes some problems) 
+
+    //    file_in.seekg (-numchars, ios::end);
+
+    while (!file_in.eof()) {
+      file_in.getline (linec, 256);
+      ret.setcstr(linec);
+      text_t::const_iterator here = ret.begin();
+      text_t::const_iterator end = ret.end();
+      // make sure line has content
+      while (here != end) {
+    if (*here != '\n' && *here != ' ') {
+      lines.push_back (ret);
+      break;
+    }
+    here ++;
+      }
+    }
+    file_in.close();
+  }
+
+  ret.clear();
+  int numlinesgot = lines.size();
+  int sindex = 0;
+  if (numlinesgot > numlines) sindex = numlinesgot - numlines;
+  for (int i = sindex; i < numlinesgot; i++) {
+    ret += lines[i] + "\n";
+  }
+
+  return ret;
+}
+
+// returns the last numlines lines (or last numlines*256 
+// characters) of file
+/*
 text_t file_tail (const text_t &filename) {
+
 
   text_t return_str, tmpstr;
   char *filenamec = filename.getcstr();
   char linec[256];
-
 
   ifstream file_in (filenamec);
@@ -313 +363 @@
   return return_str;
 }
-
+*/
 #ifdef __WIN32__
 
@@ -343 +393 @@
 
 #endif
+
+// read in file from filename and load into content
+bool read_file (const text_t &filename, text_t &content) {
+
+  content.clear();
+
+  char *filenamec = filename.getcstr();
+#ifdef GSDL_USE_IOS_H
+  ifstream file_in (filenamec, ios::in | ios::nocreate);
+#else
+  ifstream file_in (filenamec, ios::in);
+#endif
+  delete filenamec;
+
+  if (file_in) {
+    char c;
+    file_in.get(c);
+    while (!file_in.eof ()) {
+      content.push_back(c);
+      file_in.get(c);
+    }
+    file_in.close();
+  } else {
+    return false;
+  }
+  return true;
+}

trunk/gsdl/lib/fileutil.h

@@ -53 +53 @@
 bool file_copy (const text_t &fromfile, const text_t &tofile);
 
-text_t file_tail (const text_t &filename);
+text_t file_tail (const text_t &filename, int numlines);
 
 // returns true if directory created successfully
 bool mk_dir (const text_t &dirname);
 
+bool read_file (const text_t &filename, text_t &content);
+
 #endif