Changeset 1132

Timestamp:

Jul 16, 2010, 5:24:35 AM (13 years ago)

Author:

Peter Johansson

Message:

when updating copyright, write to #file# and then rename that file rather than writing in /tmp which might be a a different device and rename doesn't work. fixes #285

Location:

trunk/lib

Files:

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

trunk/lib/File.cc

@@ -401 +401 @@
                               size_t start_at_line, size_t end_at_line) const
   {
-    // Code copied from Gnuplot -r70
-    char tmpname[]="/tmp/svndigestXXXXXX";
-    int fd=mkstemp(tmpname);  // mkstemp return a file descriptor
-    if (fd == -1)
-      throw std::runtime_error(std::string("Failed to get unique filename: ") +
-                               tmpname);
-    // Jari would like to do something like 'std::ofstream tmp(fd);'
-    // but has to settle for (which is stupid since the file is
-    // already open for writing.
-    std::ofstream tmp(tmpname);
+    // embrace filename with brackets #filename#
+    std::string tmpname = concatenate_path(directory_name(path()),
+                                           "#" + file_name(path()) + "#");
+    std::ofstream tmp(tmpname.c_str());
 
     using namespace std;
@@ -438 +432 @@
     is.close();
     tmp.close();
-    close(fd);
-    // get file permission
-    struct stat nodestat;
-    stat(path().c_str(),&nodestat);
     
-    // 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 << "svncopyright: 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);
-
-    chmod(path().c_str(), nodestat.st_mode);
+    // finally rename file 
+    rename(tmpname, path());
   }
 

trunk/lib/utility.cc

@@ -289 +289 @@
 
 
+  void rename(const std::string& from, const std::string to)
+  {
+    int code = ::rename(from.c_str(), to.c_str());
+    if (code){
+      std::stringstream ss;
+      ss << "rename(" << from << ", " << to << "): failed\n" << strerror(errno);
+      throw std::runtime_error(ss.str());
+    }
+  }
+
+
   void replace(std::string& str, std::string old_str, std::string new_str)
   {

trunk/lib/utility.h

@@ -176 +176 @@
   bool regexp(const std::string& pattern, const std::string& str,
               std::vector<std::string>& vec);
+
+  /**
+     same as rename(2) but throw errno if error is encountered
+
+     \see man rename
+   */
+  void rename(const std::string& from, const std::string to);
 
   /**