The patches for 3.2.3.

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

diff --git a/fsync.diff b/fsync.diff
index bb79d65ab546b3f2d547a3ff5baf47e4c2dfbab6..3e1041d9e11ac06cda21eafb47038949362c95fe 100644 (file)
--- a/fsync.diff
+++ b/fsync.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: 8695bcc2b140b2518254234659a03b96f04055fc
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -69,6 +69,7 @@ int open_noatime = 0;
+@@ -66,6 +66,7 @@ int open_noatime = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
@@ -19,7 +19,7 @@ diff --git a/options.c b/options.c
  int ignore_times = 0;
  int delete_mode = 0;
  int delete_during = 0;
-@@ -1010,6 +1011,7 @@ static struct poptOption long_options[] = {
+@@ -789,6 +790,7 @@ static struct poptOption long_options[] = {
    {"no-timeout",       0,  POPT_ARG_VAL,    &io_timeout, 0, 0, 0 },
    {"contimeout",       0,  POPT_ARG_INT,    &connect_timeout, 0, 0, 0 },
    {"no-contimeout",    0,  POPT_ARG_VAL,    &connect_timeout, 0, 0, 0 },
@@ -27,7 +27,7 @@ diff --git a/options.c b/options.c
    {"stop-after",       0,  POPT_ARG_STRING, 0, OPT_STOP_AFTER, 0, 0 },
    {"time-limit",       0,  POPT_ARG_STRING, 0, OPT_STOP_AFTER, 0, 0 }, /* earlier stop-after name */
    {"stop-at",          0,  POPT_ARG_STRING, 0, OPT_STOP_AT, 0, 0 },
-@@ -3078,6 +3080,9 @@ void server_options(char **args, int *argc_p)
+@@ -2845,6 +2847,9 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = tmpdir;
                }