X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=fsync.diff;h=a5b6116266963756204a56e9b2ca8e9134038a7f;hp=bb7327650f74d8306c028c9c4ee09ff1aa186cc8;hb=952918f09db2a4aa51e7c0ca0e689bf3f922b48f;hpb=7170ca8dba0a407cd0c91b41b48163c7b682abb1

diff --git a/fsync.diff b/fsync.diff
index bb73276..a5b6116 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
+based-on: d64bda1c1e79dc385f194d74f7957ce7cd118654
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -19,7 +19,7 @@ diff --git a/options.c b/options.c
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -730,6 +731,7 @@ void usage(enum logcode F)
+@@ -733,6 +734,7 @@ void usage(enum logcode F)
    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," -m, --prune-empty-dirs      prune empty directory chains from the file-list\n");
@@ -27,7 +27,7 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --usermap=STRING        custom username mapping\n");
    rprintf(F,"     --groupmap=STRING       custom groupname mapping\n");
-@@ -988,6 +990,7 @@ static struct poptOption long_options[] = {
+@@ -994,6 +996,7 @@ static struct poptOption long_options[] = {
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
    {"contimeout",       0,  POPT_ARG_INT,    &connect_timeout, 0, 0, 0 },
    {"no-contimeout",    0,  POPT_ARG_VAL,    &connect_timeout, 0, 0, 0 },
@@ -35,7 +35,7 @@ diff --git a/options.c b/options.c
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -2572,6 +2575,9 @@ void server_options(char **args, int *argc_p)
+@@ -2620,6 +2623,9 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = tmpdir;
  		}
  
@@ -56,7 +56,7 @@ diff --git a/receiver.c b/receiver.c
  extern int basis_dir_cnt;
  extern int make_backups;
  extern int cleanup_got_literal;
-@@ -305,6 +306,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
+@@ -341,6 +342,12 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
  	if (sum_end(file_sum1) != checksum_len)
  		overflow_exit("checksum_len"); /* Impossible... */
  
@@ -83,15 +83,15 @@ diff --git a/t_stub.c b/t_stub.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -27,6 +27,7 @@
+@@ -26,6 +26,7 @@
+ #include "inums.h"
  
- extern int dry_run;
  extern int module_id;
 +extern int do_fsync;
  extern int modify_window;
  extern int relative_paths;
- extern int preserve_xattrs;
-@@ -374,6 +375,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
+ extern int preserve_times;
+@@ -370,6 +371,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
  			full_fname(source));
  	}