X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/6cf4b26e813f850a520b32d564cfb2b298a1bfc9..9f085fa3bd0053dde970cba09af3ee51cbb8791a:/fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 9877bcb..7d53eda 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/options.c
 +++ new/options.c
-@@ -44,6 +44,7 @@ int append_mode = 0;
+@@ -45,6 +45,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_dirlinks = 0;
  int copy_links = 0;
@@ -17,7 +17,7 @@ To use this patch, run these commands for a successful build:
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -345,6 +346,7 @@ void usage(enum logcode F)
+@@ -375,6 +376,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");
@@ -25,35 +25,35 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -539,6 +541,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},
-+  {"fsync",            0,  POPT_ARG_NONE,   &do_fsync, 0, 0, 0 },
-   {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
+@@ -600,6 +602,7 @@ static struct poptOption long_options[] 
+   {"no-numeric-ids",   0,  POPT_ARG_VAL,    &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
+   {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
++  {"fsync",            0,  POPT_ARG_NONE,   &do_fsync, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1777,6 +1780,9 @@ void server_options(char **args,int *arg
- 		args[ac++] = tmpdir;
- 	}
+   {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+@@ -1934,6 +1937,9 @@ void server_options(char **args, int *ar
+ 			args[ac++] = tmpdir;
+ 		}
  
-+	if (do_fsync && am_sender)
-+		args[ac++] = "--fsync";
++		if (do_fsync)
++			args[ac++] = "--fsync";
 +
- 	if (basis_dir[0] && am_sender) {
- 		/* the server only needs this option if it is not the sender,
- 		 *   and it may be an older version that doesn't know this
+ 		if (basis_dir[0]) {
+ 			/* the server only needs this option if it is not the sender,
+ 			 *   and it may be an older version that doesn't know this
 --- old/receiver.c
 +++ new/receiver.c
-@@ -37,6 +37,7 @@ extern int protocol_version;
- extern int relative_paths;
+@@ -39,6 +39,7 @@ extern int relative_paths;
  extern int preserve_hard_links;
  extern int preserve_perms;
+ extern int preserve_xattrs;
 +extern int do_fsync;
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -257,6 +258,12 @@ static int receive_data(int f_in, char *
+@@ -261,6 +262,12 @@ static int receive_data(int f_in, char *
  		exit_cleanup(RERR_FILEIO);
  	}
  
@@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build:
  extern int modify_window;
  extern int relative_paths;
  extern int human_readable;
-@@ -309,6 +310,13 @@ int copy_file(const char *source, const 
+@@ -310,6 +311,13 @@ int copy_file(const char *source, const 
  			full_fname(source));
  	}