Got rid of patch-fuzz.

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

diff --git a/fsync.diff b/fsync.diff
index bbb3b83..c4ae0e0 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,8 +1,8 @@
 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-10-14 17:11:40
-+++ options.c  2004-07-03 20:18:13
+--- orig/options.c     2005-01-17 23:11:45
++++ options.c  2004-11-27 18:10:44
 @@ -38,6 +38,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
@@ -11,15 +11,15 @@ to be called on every file we write.
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -240,6 +241,7 @@ void usage(enum logcode F)
+@@ -247,6 +248,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,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-@@ -339,6 +341,7 @@ static struct poptOption long_options[] 
+@@ -350,6 +352,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,27 +27,27 @@ 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 },
-@@ -1135,6 +1138,9 @@ void server_options(char **args,int *arg
+@@ -1208,6 +1211,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
 +      if (do_fsync && am_sender)
 +              args[ac++] = "--fsync";
 +
-       if (compare_dest && am_sender) {
+       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    2004-09-21 09:40:27
+--- orig/receiver.c    2005-01-17 23:11:45
 +++ receiver.c 2004-07-16 20:13:31
-@@ -36,6 +36,7 @@ extern int preserve_hard_links;
+@@ -37,6 +37,7 @@ extern int preserve_hard_links;
  extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
 +extern int do_fsync;
  extern char *tmpdir;
  extern char *partial_dir;
- extern char *compare_dest;
-@@ -305,6 +306,12 @@ static int receive_data(int f_in, char *
+ extern char *basis_dir[];
+@@ -310,6 +311,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }