This patch will make rsync 3.0.x able to exchange ACLs with an older

[rsync/rsync-patches.git] / fsync.diff

diff --git a/fsync.diff b/fsync.diff
index 42f85a4..2c8e77f 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -17,7 +17,7 @@ To use this patch, run these commands for a successful build:
  int preserve_links = 0;
  int preserve_hard_links = 0;
  int preserve_perms = 0;
-@@ -339,6 +340,7 @@ void usage(enum logcode F)
+@@ -336,6 +337,7 @@ void usage(enum logcode F)
    rprintf(F,"     --partial-dir=DIR       put a partially transferred file into DIR\n");
    rprintf(F,"     --delay-updates         put all updated files into place at transfer's end\n");
    rprintf(F," -m, --prune-empty-dirs      prune empty directory chains from the file-list\n");
@@ -25,7 +25,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --numeric-ids           don't map uid/gid values by user/group name\n");
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
-@@ -525,6 +527,7 @@ static struct poptOption long_options[] 
+@@ -523,6 +525,7 @@ static struct poptOption long_options[] 
    {"only-write-batch", 0,  POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
@@ -33,7 +33,7 @@ To use this patch, run these commands for a successful build:
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1727,6 +1730,9 @@ void server_options(char **args,int *arg
+@@ -1743,6 +1746,9 @@ void server_options(char **args,int *arg
                args[ac++] = tmpdir;
        }
  
@@ -45,7 +45,7 @@ To use this patch, run these commands for a successful build:
                 *   and it may be an older version that doesn't know this
 --- old/receiver.c
 +++ new/receiver.c
-@@ -37,6 +37,7 @@ extern int protocol_version;
+@@ -38,6 +38,7 @@ extern int protocol_version;
  extern int relative_paths;
  extern int preserve_hard_links;
  extern int preserve_perms;
@@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build:
  extern int modify_window;
  extern int relative_paths;
  extern int human_readable;
-@@ -314,6 +315,12 @@ int copy_file(const char *source, const 
+@@ -316,6 +317,12 @@ int copy_file(const char *source, const 
                return -1;
        }