Fix failing hunks.

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

diff --git a/fsync.diff b/fsync.diff
index 275cfdc..60d3da9 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     2004-07-15 16:51:50
+--- orig/options.c     2004-07-20 21:36:07
 +++ options.c  2004-07-03 20:18:13
 @@ -38,6 +38,7 @@ int make_backups = 0;
   **/
@@ -11,15 +11,15 @@ to be called on every file we write.
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -232,6 +233,7 @@ void usage(enum logcode F)
+@@ -238,6 +239,7 @@ void usage(enum logcode F)
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
    rprintf(F,"     --backup-dir            make backups into this directory\n");
    rprintf(F,"     --suffix=SUFFIX         backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
 +  rprintf(F,"     --fsync                 fsync every written file\n");
    rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
+   rprintf(F,"     --inplace               update destination files inplace (SEE MAN PAGE)\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
-@@ -336,6 +338,7 @@ static struct poptOption long_options[] 
+@@ -343,6 +345,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 },
-@@ -960,6 +963,9 @@ void server_options(char **args,int *arg
+@@ -998,6 +1001,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -37,17 +37,17 @@ to be called on every file we write.
        if (compare_dest && 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    2004-07-14 17:12:06
-+++ receiver.c 2004-07-03 20:18:13
-@@ -48,6 +48,7 @@ extern int ignore_errors;
- extern int orig_umask;
- extern int keep_partial;
- extern int checksum_seed;
+--- orig/receiver.c    2004-07-20 21:36:07
++++ receiver.c 2004-07-16 20:13:31
+@@ -35,6 +35,7 @@ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int cvs_exclude;
+ extern int io_error;
 +extern int do_fsync;
- 
- static void delete_one(char *fn, int is_dir)
- {
-@@ -274,6 +275,12 @@ static int receive_data(int f_in,struct 
+ extern char *tmpdir;
+ extern char *compare_dest;
+ extern int make_backups;
+@@ -304,6 +305,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
@@ -59,7 +59,7 @@ to be called on every file we write.
 +
        sum_end(file_sum1);
  
-       read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
+       if (mapbuf)
 --- orig/util.c        2004-06-09 21:54:47
 +++ util.c     2004-07-03 20:18:13
 @@ -32,6 +32,7 @@ extern int dry_run;