Changeset 456

Timestamp:

Aug 21, 2007, 9:56:06 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Refs #251.

Location:

branches/0.6-stable/lib

Files:

• File.cc (modified) (2 diffs)
• File.h (modified) (1 diff)
• utility.cc (modified) (1 diff)
• utility.h (modified) (1 diff)

branches/0.6-stable/lib/File.cc

@@ -34 +34 @@
 
 #include <cassert>
+#include <cstdio>
 #include <ctime>
 #include <fstream>
@@ -254 +255 @@
     tmp.close();
     close(fd);
-    // finally move printed temporary file to original file
-    rename(tmpname, path().c_str());
+    // finally copy temporary file to replace original file, and
+    // remove the temporary file
+    try {
+      copy_file(tmpname, path());
+    }
+    catch (std::runtime_error e) {
+      // catch exception, cleanup, and rethrow
+      std::cerr << "File::print_copyright: Exception caught, "
+                << "removing temporary file " << tmpname << std::endl;
+      if (unlink(tmpname))
+        throw runtime_error(std::string("File::print_copyright: ") +
+                            "failed to unlink temporary file" + tmpname);
+      throw;
+    }
+    if (unlink(tmpname))
+      throw runtime_error(std::string("File::print_copyright: ") +
+                          "failed to unlink temporary file" + tmpname);
   }
 

branches/0.6-stable/lib/File.h

@@ -66 +66 @@
     const Stats& parse(const bool verbose=false);
 
+    /**
+       @throw std::runtime_error when a file error is encountered
+       updating the copyrights.
+    */
     void print_copyright(std::map<std::string, Alias>&) const;
 

branches/0.6-stable/lib/utility.cc

@@ -61 +61 @@
 
 
+  void copy_file(const std::string& source, const std::string& target)
+  {
+    std::ofstream o(target.c_str());
+    std::ifstream i(source.c_str());
+    while (i.good()) {
+      char ch=i.get();
+      if (i.good())
+        o.put(ch);
+      if (!o.good())
+        throw std::runtime_error(std::string("copy_file: ") +
+                                 "writing target file failed '" + target + "'");
+    }
+    if (!i.eof() && (i.bad() || i.fail()))  // fail on everything except eof
+      throw std::runtime_error(std::string("copy_file: ") +
+                               "error reading source file '" + source + "'");
+    i.close(); o.close();
+  }
+
+
   std::string file_name(const std::string& full_path)
   {

branches/0.6-stable/lib/utility.h

@@ -53 +53 @@
   ///
   int access_rights(const std::string& path,const std::string& bits);
+
+  /**
+     @brief Copy file \a source to \a target.
+
+     @throw std::runtime_error when read error of \a source or write
+     error for \a target is encountered.
+  */
+  void copy_file(const std::string& source, const std::string& target);
 
   ///