The patches for 3.2.5.

[rsync-patches.git] / direct-io.diff

diff --git a/direct-io.diff b/direct-io.diff
index cab1cd7dca273d06f7769d9b994cec4889143afb..1ad91ec705cc421d32a0f3d2a63e98f26e9de9f1 100644 (file)
--- a/direct-io.diff
+++ b/direct-io.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: cc832943160fb2cbaeaf45942b724828399edd37
+based-on: 5fcf20ee9d8abf7aae8578354f82c6f500822e06
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -22,7 +22,7 @@ diff --git a/options.c b/options.c
  extern int module_id;
  extern int local_server;
  extern int sanitize_paths;
-@@ -758,6 +759,8 @@ static struct poptOption long_options[] = {
+@@ -763,6 +764,8 @@ static struct poptOption long_options[] = {
    {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
    {"delay-updates",    0,  POPT_ARG_VAL,    &delay_updates, 1, 0, 0 },
    {"no-delay-updates", 0,  POPT_ARG_VAL,    &delay_updates, 0, 0, 0 },
@@ -34,7 +34,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -414,6 +414,7 @@ has its own detailed description later in this man page.
+@@ -434,6 +434,7 @@ has its own detailed description later in this manpage.
  --partial                keep partially transferred files
  --partial-dir=DIR        put a partially transferred file into DIR
  --delay-updates          put all updated files into place at end
@@ -42,7 +42,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --prune-empty-dirs, -m   prune empty directory chains from file-list
  --numeric-ids            don't map uid/gid values by user/group name
  --usermap=STRING         custom username mapping
-@@ -3238,6 +3239,17 @@ your home directory (remove the '=' for that).
+@@ -3339,6 +3340,17 @@ expand it.
      update algorithm that is even more atomic (it uses [`--link-dest`](#opt)
      and a parallel hierarchy of files).