X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/sparse-block.diff

diff --git a/sparse-block.diff b/sparse-block.diff
index bb8d199..021534c 100644
--- a/sparse-block.diff
+++ b/sparse-block.diff
@@ -18,8 +18,8 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/fileio.c b/fileio.c
-index 0faa619..b76dc02 100644
 --- a/fileio.c
 +++ b/fileio.c
 @@ -27,6 +27,7 @@
@@ -40,7 +40,6 @@ index 0faa619..b76dc02 100644
  		} else {
  			if (!wf_writeBuf) {
 diff --git a/options.c b/options.c
-index e7c6c61..a0fb2e7 100644
 --- a/options.c
 +++ b/options.c
 @@ -73,6 +73,7 @@ int remove_source_files = 0;
@@ -67,7 +66,7 @@ index e7c6c61..a0fb2e7 100644
    {"inplace",          0,  POPT_ARG_VAL,    &inplace, 1, 0, 0 },
    {"no-inplace",       0,  POPT_ARG_VAL,    &inplace, 0, 0, 0 },
    {"append",           0,  POPT_ARG_NONE,   0, OPT_APPEND, 0, 0 },
-@@ -2416,6 +2419,12 @@ void server_options(char **args, int *argc_p)
+@@ -2433,6 +2436,12 @@ void server_options(char **args, int *argc_p)
  		args[ac++] = arg;
  	}
  
@@ -81,7 +80,6 @@ index e7c6c61..a0fb2e7 100644
  		if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
  			goto oom;
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..5fa8396 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -359,6 +359,7 @@ to the detailed description below for a complete description.  verb(
@@ -92,7 +90,7 @@ index 941f7a5..5fa8396 100644
   -n, --dry-run               perform a trial run with no changes made
   -W, --whole-file            copy files whole (w/o delta-xfer algorithm)
   -x, --one-file-system       don't cross filesystem boundaries
-@@ -1120,6 +1121,15 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
+@@ -1127,6 +1128,15 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
  filesystem. It doesn't seem to handle seeks over null regions
  correctly and ends up corrupting the files.