Updated to apply cleanly.

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

diff --git a/fsync.diff b/fsync.diff
index 3b30436..121c855 100644 (file)
--- 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-03-17 09:05:21
+--- orig/options.c     2005-03-24 16:41:46
 +++ options.c  2005-01-28 19:30:47
 @@ -39,6 +39,7 @@ int make_backups = 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 },
-@@ -1431,6 +1434,9 @@ void server_options(char **args,int *arg
+@@ -1426,6 +1429,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -37,7 +37,7 @@ 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-03-16 02:19:30
+--- orig/receiver.c    2005-03-24 16:41:46
 +++ receiver.c 2005-02-20 00:17:37
 @@ -37,6 +37,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;