X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5214a41bbae94607b196b199b483710e1babf292..refs/heads/master:/copy-devices.diff

diff --git a/copy-devices.diff b/copy-devices.diff
index 7646790..62635ec 100644
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,7 +8,7 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -20,7 +20,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_executability;
-@@ -1495,7 +1496,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1494,7 +1495,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		goto cleanup;
  	}
  
@@ -56,7 +56,7 @@ diff --git a/options.c b/options.c
    {"specials",         0,  POPT_ARG_VAL,    &preserve_specials, 1, 0, 0 },
    {"no-specials",      0,  POPT_ARG_VAL,    &preserve_specials, 0, 0, 0 },
    {"links",           'l', POPT_ARG_VAL,    &preserve_links, 1, 0, 0 },
-@@ -2646,6 +2649,9 @@ void server_options(char **args, int *argc_p)
+@@ -2661,6 +2664,9 @@ void server_options(char **args, int *argc_p)
  	else if (remove_source_files)
  		args[ac++] = "--remove-sent-files";
  
@@ -90,7 +90,7 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/sender.c b/sender.c
 --- a/sender.c
 +++ b/sender.c
-@@ -340,6 +340,20 @@ void send_files(int f_in, int f_out)
+@@ -341,6 +341,20 @@ void send_files(int f_in, int f_out)
  			exit_cleanup(RERR_FILEIO);
  		}