Fixed fuzz and failed hunks.

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

diff --git a/fsync.diff b/fsync.diff
index 78262f2..fab45ed 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,25 +1,25 @@
 This patch from Sami Farin lets you specify --fsync if you want fsync()
 to be called on every file we write.
 
---- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  21 May 2004 08:59:11 -0000
-@@ -37,6 +37,7 @@ int make_backups = 0;
+--- options.c  6 Jun 2004 19:02:40 -0000       1.155
++++ options.c  6 Jun 2004 21:20:05 -0000
+@@ -38,6 +38,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
  
 +int do_fsync = 0;
  int archive_mode = 0;
+ int keep_dirlinks = 0;
  int copy_links = 0;
- int preserve_links = 0;
-@@ -230,6 +231,7 @@ void usage(enum logcode F)
+@@ -233,6 +234,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," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -l, --links                 copy symlinks as symlinks\n");
-   rprintf(F," -L, --copy-links            copy the referent of all symlinks\n");
-@@ -332,6 +334,7 @@ static struct poptOption long_options[] 
+@@ -337,6 +339,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 },
-@@ -944,6 +947,9 @@ void server_options(char **args,int *arg
+@@ -973,6 +976,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -38,7 +38,7 @@ to be called on every file we write.
                /* the server only needs this option if it is not the sender,
                 *   and it may be an older version that doesn't know this
 --- receiver.c 21 May 2004 08:27:04 -0000      1.79
-+++ receiver.c 21 May 2004 08:59:11 -0000
++++ receiver.c 6 Jun 2004 21:20:05 -0000
 @@ -47,6 +47,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
@@ -60,8 +60,8 @@ to be called on every file we write.
        sum_end(file_sum1);
  
        read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
---- util.c     21 May 2004 08:40:25 -0000      1.144
-+++ util.c     21 May 2004 08:59:11 -0000
+--- util.c     5 Jun 2004 20:26:56 -0000       1.148
++++ util.c     6 Jun 2004 21:20:06 -0000
 @@ -32,6 +32,7 @@ extern int dry_run;
  extern int module_id;
  extern int modify_window;