[Monotone-commits-diffs] net.venge.monotone: 7f35bea8a325edba1786625efa7f237311e1ec5d

[code]

revision:            7f35bea8a325edba1786625efa7f237311e1ec5d
date:                2012-04-26T19:14:02
author:              address@hidden
branch:              net.venge.monotone
changelog:           disapproval of revision 
'bbfc042f41c7d2582b459470cd56ea4017a74ef4'
manifest:
format_version "1"

new_manifest [ce7dcde6392fe24513211a6674a9966870d42d1d]

old_revision [bbfc042f41c7d2582b459470cd56ea4017a74ef4]

patch "src/unix/fs.cc"
 from [030ebb81f78bc138de3cf89e3ace8e9dcde2309c]
   to [d34f7ed4b5cf3655d7920568e4e1a146fa670e13]
============================================================
--- src/unix/fs.cc	030ebb81f78bc138de3cf89e3ace8e9dcde2309c
+++ src/unix/fs.cc	d34f7ed4b5cf3655d7920568e4e1a146fa670e13
@@ -1,4 +1,3 @@
-// Copyright (C) 2012 Stephe Leake <address@hidden>
 // Copyright (C) 2005 nathaniel smith <address@hidden>
 //
 // This program is made available under the GNU GPL version 2.0 or
@@ -29,7 +28,6 @@
 #include "../platform.hh"
 #include "../vector.hh"
 
-using std::malloc;
 using std::string;
 using std::vector;
 
@@ -290,74 +288,11 @@ rename_clobberingly(string const & from,
 void
 rename_clobberingly(string const & from, string const & to)
 {
-  // rename doesn't work across devices, which can happen if part of the
-  // workspace is NFS mounted.
-  //
-  // We only check for that if rename fails, to avoid slowing down normal
-  // workspaces.
-
   if (rename(from.c_str(), to.c_str()))
     {
-      // rename failed
-      int err = errno;
-
-      int from_fd = open(from.c_str(), O_RDONLY);
-      int to_fd = open(to.c_str(), O_WRONLY | O_CREAT | O_TRUNC);
-      struct stat from_stat;
-      struct stat to_stat;
-      fstat(from_fd, &from_stat);
-      fstat(to_fd, &to_stat);
-
-      if (from_stat.st_dev /= to_stat.st_dev)
-        {
-          // different devices; use cp, rm
-          //
-          // except there isn't a C function that does 'cp', so we read in
-          // the file and write it out again.
-
-          char * buffer    = (char * )malloc(from_stat.st_size);
-          char * ptr       = buffer;
-          size_t remaining = from_stat.st_size;
-
-          do
-            {
-              ssize_t read_count = read(from_fd, ptr, remaining);
-
-              err = errno;
-
-              E(read_count >= 0, origin::system,
-                F ("error reading file '%s': %s") % from % os_strerror(err));
-
-              remaining -= read_count;
-              ptr       += read_count;
-            }
-          while (remaining > 0);
-          close(from_fd);
-
-          ptr       = buffer;
-          remaining = from_stat.st_size;
-          do
-            {
-              ssize_t write_count = write(to_fd, ptr, remaining);
-              err = errno;
-              E(write_count >= 0, origin::system,
-                F("error writing file '%s': %s") % to % os_strerror(err));
-
-              remaining -= write_count;
-              ptr       += write_count;
-            }
-          while (remaining > 0);
-          close(to_fd);
-
-          free(buffer);
-
-          remove(from.c_str());
-        }
-      else
-        {
-          E(false, origin::system,
-            F("renaming '%s' to '%s' failed: %s") % from % to % os_strerror(err));
-        }
+      const int err = errno;
+      E(false, origin::system,
+        F("renaming '%s' to '%s' failed: %s") % from % to % os_strerror(err));
     }
 }