Fixed the device/special discarding in get_xattr().

[rsync-patches.git] / copy-devices.diff

diff --git a/copy-devices.diff b/copy-devices.diff
index 21a9cebbf6a561e70e546b851225dee26496f308..60aca11eeb216656e829987bc7a4df3a633edeb6 100644 (file)
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -8,8 +8,9 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
---- old/generator.c
-+++ new/generator.c
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
 @@ -39,6 +39,7 @@ extern int preserve_acls;
  extern int preserve_xattrs;
  extern int preserve_links;
@@ -17,8 +18,8 @@ To use this patch, run these commands for a successful build:
 +extern int copy_devices;
  extern int preserve_specials;
  extern int preserve_hard_links;
- extern int preserve_perms;
-@@ -1477,7 +1478,7 @@ static void recv_generator(char *fname, 
+ extern int preserve_executability;
+@@ -1670,7 +1671,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -27,9 +28,10 @@ To use this patch, run these commands for a successful build:
                if (solo_file)
                        fname = f_name(file, NULL);
                rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
---- old/options.c
-+++ new/options.c
-@@ -45,6 +45,7 @@ int append_mode = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -48,6 +48,7 @@ int append_mode = 0;
  int keep_dirlinks = 0;
  int copy_dirlinks = 0;
  int copy_links = 0;
@@ -37,7 +39,7 @@ To use this patch, run these commands for a successful build:
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_acls = 0;
-@@ -334,6 +335,7 @@ void usage(enum logcode F)
+@@ -349,6 +350,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");
@@ -45,7 +47,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --specials              preserve special files\n");
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
-@@ -488,6 +490,7 @@ static struct poptOption long_options[] 
+@@ -507,6 +509,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 },
@@ -53,27 +55,28 @@ To use this patch, run these commands for a successful build:
    {"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 },
-@@ -1944,6 +1947,9 @@ void server_options(char **args,int *arg
+@@ -2048,6 +2051,9 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";
  
 +      if (copy_devices)
 +              args[ac++] = "--copy-devices";
 +
-       *argc = ac;
+       *argc_p = ac;
        return;
  
---- old/rsync.c
-+++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int preserve_perms;
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -34,6 +34,7 @@ extern int preserve_xattrs;
+ extern int preserve_perms;
  extern int preserve_executability;
  extern int preserve_times;
- extern int omit_dir_times;
 +extern int copy_devices;
  extern int am_root;
  extern int am_server;
  extern int am_sender;
-@@ -220,7 +221,8 @@ int read_ndx_and_attrs(int f_in, int *if
+@@ -326,7 +327,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
  
        if (iflags & ITEM_TRANSFER) {
                int i = ndx - cur_flist->ndx_start;
@@ -83,9 +86,10 @@ To use this patch, run these commands for a successful build:
                        rprintf(FERROR,
                                "received request to transfer non-regular file: %d [%s]\n",
                                ndx, who_am_i());
---- old/sender.c
-+++ new/sender.c
-@@ -314,6 +314,20 @@ void send_files(int f_in, int f_out)
+diff --git a/sender.c b/sender.c
+--- a/sender.c
++++ b/sender.c
+@@ -315,6 +315,20 @@ void send_files(int f_in, int f_out)
                        exit_cleanup(RERR_PROTOCOL);
                }