Fixed a failing hunk.

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

diff --git a/fsync.diff b/fsync.diff
index 960938d..f14a026 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,17 +1,17 @@
 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-05-19 08:52:42
-+++ options.c  2005-01-28 19:30:47
-@@ -38,6 +38,7 @@ int make_backups = 0;
-  **/
- int whole_file = -1;
- 
-+int do_fsync = 0;
+--- orig/options.c     2005-07-28 01:46:25
++++ options.c  2005-07-28 01:47:53
+@@ -42,6 +42,7 @@ int append_mode = 0;
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -311,6 +312,7 @@ void usage(enum logcode F)
++int do_fsync = 0;
+ int preserve_links = 0;
+ int preserve_hard_links = 0;
+ int preserve_perms = 0;
+@@ -314,6 +315,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");
-@@ -395,6 +397,7 @@ static struct poptOption long_options[] 
+@@ -398,6 +400,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 },
-@@ -1446,6 +1449,9 @@ void server_options(char **args,int *arg
+@@ -1471,6 +1474,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-04-14 01:53:12
+--- orig/receiver.c    2005-07-28 01:46:25
 +++ receiver.c 2005-02-20 00:17:37
 @@ -38,6 +38,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
@@ -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;
-@@ -291,6 +292,12 @@ static int receive_data(int f_in, char *
+@@ -314,6 +315,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -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-05-03 16:47:33
+--- orig/util.c        2005-07-27 23:31:12
 +++ 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;
  
-@@ -299,6 +300,12 @@ int copy_file(char *source, char *dest, 
+@@ -310,6 +311,12 @@ int copy_file(char *source, char *dest, 
                return -1;
        }