Removing applied patch.

[rsync/rsync-patches.git] / fsync.diff

diff --git a/fsync.diff b/fsync.diff
index f48325d..d0ec598 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,8 +1,8 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  27 Apr 2004 20:05:03 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  15 May 2004 20:20:27 -0000
 @@ -37,6 +37,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
@@ -37,31 +37,31 @@ to be called on every file we write.
  
        if (compare_dest && am_sender) {
                /* the server only needs this option if it is not the sender,
---- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
-+++ receiver.c 27 Apr 2004 20:05:03 -0000
-@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
- extern int module_id;
+--- receiver.c 15 May 2004 19:31:10 -0000      1.78
++++ receiver.c 15 May 2004 20:20:27 -0000
+@@ -46,6 +46,7 @@ extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
+ extern int keep_partial;
 +extern int do_fsync;
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -264,6 +265,12 @@ static int receive_data(int f_in,struct 
+@@ -266,6 +267,12 @@ static int receive_data(int f_in,struct 
  
        if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
-               rprintf(FERROR, "write failed on %s: %s\n",
-+                      full_fname(fname), strerror(errno));
+               rsyserr(FERROR, errno, "write failed on %s",
++                      full_fname(fname));
 +              exit_cleanup(RERR_FILEIO);
 +      }
 +
 +      if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
-+              rprintf(FERROR, "fsync failed on %s: %s\n",
-                       full_fname(fname), strerror(errno));
++              rsyserr(FERROR, errno, "fsync failed on %s",
+                       full_fname(fname));
                exit_cleanup(RERR_FILEIO);
        }
---- util.c     27 Apr 2004 19:59:37 -0000      1.141
-+++ util.c     27 Apr 2004 20:05:04 -0000
+--- util.c     15 May 2004 19:31:10 -0000      1.143
++++ util.c     15 May 2004 20:20:28 -0000
 @@ -29,6 +29,7 @@
  
  extern int verbose;
@@ -70,16 +70,16 @@ to be called on every file we write.
  
  int sanitize_paths = 0;
  
-@@ -296,6 +297,12 @@ int copy_file(char *source, char *dest, 
+@@ -291,6 +292,12 @@ int copy_file(char *source, char *dest, 
  
        if (close(ofd) < 0) {
-               rprintf(FERROR, "close failed on %s: %s\n",
-+                      full_fname(dest), strerror(errno));
+               rsyserr(FERROR, errno, "close failed on %s",
++                      full_fname(dest));
 +              return -1;
 +      }
 +
 +      if (do_fsync && fsync(ofd) < 0) {
-+              rprintf(FERROR, "fsync failed on %s: %s\n",
-                       full_fname(dest), strerror(errno));
++              rsyserr(FERROR, errno, "fsync failed on %s",
+                       full_fname(dest));
                return -1;
        }