The patches for 3.0.0pre9.

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

diff --git a/copy-devices.diff b/copy-devices.diff
index 7cb23b0..955b30d 100644 (file)
--- a/copy-devices.diff
+++ b/copy-devices.diff
@@ -19,7 +19,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_perms;
-@@ -1564,7 +1565,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1598,7 +1599,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -55,7 +55,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 },
-@@ -1999,6 +2002,9 @@ void server_options(char **args, int *argc_p)
+@@ -2000,6 +2003,9 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";