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

diff --git a/copy-devices.diff b/copy-devices.diff
index 3f143cc..7646790 100644
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,8 +8,8 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
 diff --git a/generator.c b/generator.c
-index 12007a1..a2875fd 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -39,6 +39,7 @@ extern int preserve_acls;
@@ -20,7 +20,7 @@ index 12007a1..a2875fd 100644
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_executability;
-@@ -1507,7 +1508,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1495,7 +1496,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  		goto cleanup;
  	}
  
@@ -30,7 +30,6 @@ index 12007a1..a2875fd 100644
  			fname = f_name(file, NULL);
  		rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
 diff --git a/options.c b/options.c
-index e7c6c61..b0806e8 100644
 --- a/options.c
 +++ b/options.c
 @@ -48,6 +48,7 @@ int append_mode = 0;
@@ -41,7 +40,7 @@ index e7c6c61..b0806e8 100644
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -694,6 +695,7 @@ void usage(enum logcode F)
+@@ -695,6 +696,7 @@ void usage(enum logcode F)
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F,"     --devices               preserve device files (super-user only)\n");
@@ -49,7 +48,7 @@ index e7c6c61..b0806e8 100644
    rprintf(F,"     --specials              preserve special files\n");
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
-@@ -862,6 +864,7 @@ static struct poptOption long_options[] = {
+@@ -863,6 +865,7 @@ static struct poptOption long_options[] = {
    {"no-D",             0,  POPT_ARG_NONE,   0, OPT_NO_D, 0, 0 },
    {"devices",          0,  POPT_ARG_VAL,    &preserve_devices, 1, 0, 0 },
    {"no-devices",       0,  POPT_ARG_VAL,    &preserve_devices, 0, 0, 0 },
@@ -57,7 +56,7 @@ index e7c6c61..b0806e8 100644
    {"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 },
-@@ -2609,6 +2612,9 @@ void server_options(char **args, int *argc_p)
+@@ -2646,6 +2649,9 @@ void server_options(char **args, int *argc_p)
  	else if (remove_source_files)
  		args[ac++] = "--remove-sent-files";
  
@@ -68,7 +67,6 @@ index e7c6c61..b0806e8 100644
  		rprintf(FERROR, "argc overflow in server_options().\n");
  		exit_cleanup(RERR_MALLOC);
 diff --git a/rsync.c b/rsync.c
-index 2c026a2..cfc6ffa 100644
 --- a/rsync.c
 +++ b/rsync.c
 @@ -33,6 +33,7 @@ extern int preserve_xattrs;
@@ -79,7 +77,7 @@ index 2c026a2..cfc6ffa 100644
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -330,7 +331,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
+@@ -397,7 +398,8 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
  
  	if (iflags & ITEM_TRANSFER) {
  		int i = ndx - cur_flist->ndx_start;
@@ -90,11 +88,10 @@ index 2c026a2..cfc6ffa 100644
  				"received request to transfer non-regular file: %d [%s]\n",
  				ndx, who_am_i());
 diff --git a/sender.c b/sender.c
-index bf8221d..f115457 100644
 --- a/sender.c
 +++ b/sender.c
-@@ -329,6 +329,20 @@ void send_files(int f_in, int f_out)
- 			exit_cleanup(RERR_PROTOCOL);
+@@ -340,6 +340,20 @@ void send_files(int f_in, int f_out)
+ 			exit_cleanup(RERR_FILEIO);
  		}
  
 +		/* On Matt's computer, st_size is falsely 0 for most devices.