X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a7eef964a2e3389ffd3537302f80ca42cfe9239..612d3765227d9d43bd9ba93986f8d9e6ee7baa47:/fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 2aa7dc3..42f85a4 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,17 +1,23 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/fsync.diff
+    ./configure                         (optional if already run)
+    make
+
 --- old/options.c
 +++ new/options.c
-@@ -42,6 +42,7 @@ int whole_file = -1;
- int append_mode = 0;
+@@ -45,6 +45,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
+ int copy_dirlinks = 0;
  int copy_links = 0;
 +int do_fsync = 0;
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
-@@ -327,6 +328,7 @@ void usage(enum logcode F)
+@@ -339,6 +340,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
    rprintf(F," -m, --prune-empty-dirs      prune empty directory chains from the file-list\n");
@@ -19,7 +25,7 @@ to be called on every file we write.
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
-@@ -501,6 +503,7 @@ static struct poptOption long_options[] 
+@@ -525,6 +527,7 @@ static struct poptOption long_options[] 
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -27,7 +33,7 @@ to be called on every file we write.
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1694,6 +1697,9 @@ void server_options(char **args,int *arg
+@@ -1727,6 +1730,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
@@ -39,15 +45,15 @@ to be called on every file we write.
  		 *   and it may be an older version that doesn't know this
 --- old/receiver.c
 +++ new/receiver.c
-@@ -38,6 +38,7 @@ extern int keep_dirlinks;
+@@ -37,6 +37,7 @@ extern int protocol_version;
+ extern int relative_paths;
  extern int preserve_hard_links;
  extern int preserve_perms;
- extern int io_error;
 +extern int do_fsync;
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -318,6 +319,12 @@ static int receive_data(int f_in, char *
+@@ -258,6 +259,12 @@ static int receive_data(int f_in, char *
  		exit_cleanup(RERR_FILEIO);
  	}
  
@@ -62,17 +68,17 @@ to be called on every file we write.
  	if (mapbuf)
 --- old/t_stub.c
 +++ new/t_stub.c
-@@ -30,6 +30,7 @@ int modify_window = 0;
+@@ -22,6 +22,7 @@
+ 
+ #include "rsync.h"
+ 
++int do_fsync = 0;
+ int modify_window = 0;
  int module_id = -1;
  int relative_paths = 0;
- int human_readable = 0;
-+int do_fsync;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
- 
 --- old/util.c
 +++ new/util.c
-@@ -30,6 +30,7 @@
+@@ -26,6 +26,7 @@
  extern int verbose;
  extern int dry_run;
  extern int module_id;
@@ -80,7 +86,7 @@ to be called on every file we write.
  extern int modify_window;
  extern int relative_paths;
  extern int human_readable;
-@@ -312,6 +313,12 @@ int copy_file(const char *source, const 
+@@ -314,6 +315,12 @@ int copy_file(const char *source, const 
  		return -1;
  	}