Updated patches to work with the current trunk.

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

diff --git a/write-devices.diff b/write-devices.diff
index dddd37a..5281fb7 100644 (file)
--- a/write-devices.diff
+++ b/write-devices.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 This patch has not yet been tested by me (Wayne), but was provided
 Darryl Dixon.  Thanks!
 
-based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -22,7 +22,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_specials;
  extern int preserve_hard_links;
  extern int preserve_executability;
-@@ -1533,7 +1534,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1532,7 +1533,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
        fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
@@ -58,7 +58,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 },
-@@ -1763,6 +1766,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1764,6 +1767,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        return 0;
  #endif
  
@@ -70,7 +70,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2646,6 +2654,9 @@ void server_options(char **args, int *argc_p)
+@@ -2661,6 +2669,9 @@ void server_options(char **args, int *argc_p)
        else if (remove_source_files)
                args[ac++] = "--remove-sent-files";