Fixed failing hunks.

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

diff --git a/fsync.diff b/fsync.diff
index 4767406..f380cda 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -1,9 +1,9 @@
 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-20 21:36:07
-+++ options.c  2004-07-03 20:18:13
-@@ -38,6 +38,7 @@ int make_backups = 0;
+--- orig/options.c     2005-02-01 10:39:22
++++ options.c  2005-01-28 19:30:47
+@@ -39,6 +39,7 @@ int make_backups = 0;
   **/
  int whole_file = -1;
  
@@ -11,47 +11,47 @@ to be called on every file we write.
  int archive_mode = 0;
  int keep_dirlinks = 0;
  int copy_links = 0;
-@@ -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);
+@@ -294,6 +295,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");
 +  rprintf(F,"     --fsync                 fsync every written file\n");
-   rprintf(F," -u, --update                update only (don't overwrite newer files)\n");
-   rprintf(F,"     --inplace               update the destination file inplace (see man page)\n");
-   rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
-@@ -343,6 +345,7 @@ static struct poptOption long_options[] 
+   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");
+@@ -371,6 +373,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 },
+   {"help",            'h', POPT_ARG_NONE,   0, 'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
 +  {"fsync",            0,  POPT_ARG_NONE,   &do_fsync, 0, 0, 0 },
    {"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 },
-@@ -998,6 +1001,9 @@ void server_options(char **args,int *arg
+@@ -1293,6 +1296,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-07-20 21:36:07
+--- orig/receiver.c    2005-02-03 02:04:20
 +++ receiver.c 2004-07-16 20:13:31
-@@ -35,6 +35,7 @@ extern int preserve_hard_links;
+@@ -34,6 +34,7 @@ extern int keep_dirlinks;
+ 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 *compare_dest;
- extern int make_backups;
-@@ -304,6 +305,12 @@ static int receive_data(int f_in, char *
+ extern char *partial_dir;
+ extern char *basis_dir[];
+@@ -242,6 +243,12 @@ static int receive_data(int f_in, char *
                exit_cleanup(RERR_FILEIO);
        }
  
-+      if (do_fsync && (fd != -1) && (fsync(fd) != 0)) {
++      if (do_fsync && fd != -1 && fsync(fd) != 0) {
 +              rsyserr(FERROR, errno, "fsync failed on %s",
 +                      full_fname(fname));
 +              exit_cleanup(RERR_FILEIO);
@@ -60,17 +60,27 @@ to be called on every file we write.
        sum_end(file_sum1);
  
        if (mapbuf)
---- orig/util.c        2004-06-09 21:54:47
+--- orig/t_stub.c      2005-01-25 12:14:14
++++ t_stub.c   2004-10-09 04:03:09
+@@ -28,6 +28,7 @@
+ 
+ int modify_window = 0;
+ int module_id = -1;
++int do_fsync;
+ char *partial_dir;
+ struct filter_list_struct server_filter_list;
+ 
+--- orig/util.c        2005-01-28 19:08:20
 +++ util.c     2004-07-03 20:18:13
-@@ -32,6 +32,7 @@ extern int dry_run;
- extern int module_id;
+@@ -33,6 +33,7 @@ extern int module_id;
  extern int modify_window;
- extern struct exclude_list_struct server_exclude_list;
+ extern char *partial_dir;
+ extern struct filter_list_struct server_filter_list;
 +extern int do_fsync;
  
  int sanitize_paths = 0;
  
-@@ -297,6 +298,12 @@ int copy_file(char *source, char *dest, 
+@@ -298,6 +299,12 @@ int copy_file(char *source, char *dest, 
                return -1;
        }