X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=fsync.diff;h=02ff79774b74e5ec0cf7c1a09eba32ebd4ca7bf9;hp=96c3e217df3a62f300ffc4e8f59279e810511fd0;hb=388bf7ccf1f04928edf6cbe0cc367061194e0930;hpb=ec388aff281266f0a338fab1720a1a375fefb7ef

diff --git a/fsync.diff b/fsync.diff
index 96c3e21..02ff797 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,7 +1,7 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- orig/options.c	2005-02-25 18:44:31
+--- orig/options.c	2005-05-03 16:47:32
 +++ options.c	2005-01-28 19:30:47
 @@ -39,6 +39,7 @@ int make_backups = 0;
   **/
@@ -11,7 +11,7 @@ to be called on every file we write.
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -309,6 +310,7 @@ void usage(enum logcode F)
+@@ -311,6 +312,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial               keep partially transferred files\n");
    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");
@@ -19,7 +19,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");
-@@ -389,6 +391,7 @@ static struct poptOption long_options[] 
+@@ -396,6 +398,7 @@ static struct poptOption long_options[] 
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
@@ -27,7 +27,7 @@ to be called on every file we write.
    {"dry-run",         'n', POPT_ARG_NONE,   &dry_run, 0, 0, 0 },
    {"sparse",          'S', POPT_ARG_NONE,   &sparse_files, 0, 0, 0 },
    {"cvs-exclude",     'C', POPT_ARG_NONE,   &cvs_exclude, 0, 0, 0 },
-@@ -1421,6 +1424,9 @@ void server_options(char **args,int *arg
+@@ -1450,6 +1453,9 @@ void server_options(char **args,int *arg
  		args[ac++] = tmpdir;
  	}
  
@@ -37,9 +37,9 @@ to be called on every file we write.
  	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
---- orig/receiver.c	2005-02-26 19:27:54
+--- orig/receiver.c	2005-04-14 01:53:12
 +++ receiver.c	2005-02-20 00:17:37
-@@ -37,6 +37,7 @@ extern int keep_dirlinks;
+@@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int preserve_perms;
  extern int io_error;
@@ -47,7 +47,7 @@ to be called on every file we write.
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -289,6 +290,12 @@ static int receive_data(int f_in, char *
+@@ -291,6 +292,12 @@ static int receive_data(int f_in, char *
  		exit_cleanup(RERR_FILEIO);
  	}
  
@@ -60,7 +60,7 @@ to be called on every file we write.
  	sum_end(file_sum1);
  
  	if (mapbuf)
---- orig/t_stub.c	2005-01-25 12:14:14
+--- orig/t_stub.c	2005-01-25 10:39:14
 +++ t_stub.c	2004-10-09 04:03:09
 @@ -28,6 +28,7 @@
  
@@ -70,7 +70,7 @@ to be called on every file we write.
  char *partial_dir;
  struct filter_list_struct server_filter_list;
  
---- orig/util.c	2005-02-23 02:57:27
+--- orig/util.c	2005-05-03 16:47:33
 +++ util.c	2004-07-03 20:18:13
 @@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;
@@ -80,7 +80,7 @@ to be called on every file we write.
  
  int sanitize_paths = 0;
  
-@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest, 
+@@ -299,6 +300,12 @@ int copy_file(char *source, char *dest, 
  		return -1;
  	}