The patches for 3.2.1.

[rsync-patches.git] / time-limit.diff

diff --git a/time-limit.diff b/time-limit.diff
index b97c4cbf01d55c2a2ac0415489942b79dc1a3cba..2c407935cbb9bbedb3955ea0e69c6483fc506e9c 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
-based-on: 7fb08531e0ee267e4a41e209be4cb5a24d461a2d
+based-on: a8fc8fc2d22ba7243b96decb91c586682a05e4a1
 diff --git a/io.c b/io.c
 --- a/io.c
 +++ b/io.c
@@ -61,7 +61,7 @@ diff --git a/options.c b/options.c
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -988,6 +990,8 @@ static struct poptOption long_options[] = {
+@@ -989,6 +991,8 @@ 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 },
@@ -70,7 +70,7 @@ diff --git a/options.c b/options.c
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
    {"rsync-path",       0,  POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -1879,6 +1883,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1880,6 +1884,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        return 0;
  #endif
  
@@ -107,7 +107,7 @@ diff --git a/options.c b/options.c
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2694,6 +2728,15 @@ void server_options(char **args, int *argc_p)
+@@ -2696,6 +2730,15 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -126,7 +126,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
-@@ -455,6 +455,8 @@ detailed description below for a complete description.
+@@ -456,6 +456,8 @@ detailed description below for a complete description.
  --early-input=FILE       use FILE for daemon's early exec input
  --list-only              list the files instead of copying them
  --bwlimit=RATE           limit socket I/O bandwidth
@@ -135,7 +135,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  --write-batch=FILE       write a batched update to FILE
  --only-write-batch=FILE  like --write-batch but w/o updating dest
  --read-batch=FILE        read a batched update from FILE
-@@ -3042,6 +3044,22 @@ your home directory (remove the '=' for that).
+@@ -3071,6 +3073,22 @@ your home directory (remove the '=' for that).
      buffered, while other can show up as very slow when the flushing of the
      output buffer occurs.  This may be fixed in a future version.
  
@@ -155,7 +155,7 @@ diff --git a/rsync.1.md b/rsync.1.md
 +    This option allows you to specify the maximum number of minutes rsync will
 +    run for.
 +
- 0. `--write-batch=FILE`
+ 0.  `--write-batch=FILE`
  
      Record a file that can later be applied to another identical destination
 diff --git a/util.c b/util.c