X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..5214a41bbae94607b196b199b483710e1babf292:/fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 98bfafa..61891a2 100644
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,8 +7,8 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/options.c b/options.c
-index e7c6c61..44ad60e 100644
 --- a/options.c
 +++ b/options.c
 @@ -48,6 +48,7 @@ int append_mode = 0;
@@ -19,7 +19,7 @@ index e7c6c61..44ad60e 100644
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -730,6 +731,7 @@ void usage(enum logcode F)
+@@ -731,6 +732,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 @@ index e7c6c61..44ad60e 100644
    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[] = {
+@@ -989,6 +991,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 @@ index e7c6c61..44ad60e 100644
    {"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 },
-@@ -2555,6 +2558,9 @@ void server_options(char **args, int *argc_p)
+@@ -2592,6 +2595,9 @@ void server_options(char **args, int *argc_p)
  			args[ac++] = tmpdir;
  		}
  
@@ -46,7 +46,6 @@ index e7c6c61..44ad60e 100644
  			/* the server only needs this option if it is not the sender,
  			 *   and it may be an older version that doesn't know this
 diff --git a/receiver.c b/receiver.c
-index 4325e30..1523977 100644
 --- a/receiver.c
 +++ b/receiver.c
 @@ -38,6 +38,7 @@ extern int relative_paths;
@@ -57,7 +56,7 @@ index 4325e30..1523977 100644
  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,
+@@ -337,6 +338,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... */
  
@@ -71,7 +70,6 @@ index 4325e30..1523977 100644
  		unmap_file(mapbuf);
  
 diff --git a/t_stub.c b/t_stub.c
-index 02cfa69..fb61480 100644
 --- a/t_stub.c
 +++ b/t_stub.c
 @@ -21,6 +21,7 @@
@@ -83,7 +81,6 @@ index 02cfa69..fb61480 100644
  int module_id = -1;
  int relative_paths = 0;
 diff --git a/util.c b/util.c
-index 0cafed6..88b3521 100644
 --- a/util.c
 +++ b/util.c
 @@ -27,6 +27,7 @@
@@ -94,7 +91,7 @@ index 0cafed6..88b3521 100644
  extern int modify_window;
  extern int relative_paths;
  extern int preserve_xattrs;
-@@ -334,6 +335,13 @@ int copy_file(const char *source, const char *dest, int ofd,
+@@ -382,6 +383,13 @@ int copy_file(const char *source, const char *dest, int ofd, mode_t mode)
  			full_fname(source));
  	}