Adding filter-attribute-mods patch; updating patches.

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

diff --git a/time-limit.diff b/time-limit.diff
index 7e1fd66..5f13f19 100644 (file)
--- a/time-limit.diff
+++ b/time-limit.diff
@@ -9,8 +9,8 @@ To use this patch, run these commands for a successful build:
     ./configure                              (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/io.c b/io.c
-index 6a89c8f..d248f0f 100644
 --- a/io.c
 +++ b/io.c
 @@ -53,6 +53,7 @@ extern int protocol_version;
@@ -50,7 +50,6 @@ index 6a89c8f..d248f0f 100644
                if (!am_server && !am_daemon) {
                        rprintf(FERROR, "io timeout after %d seconds -- exiting\n",
 diff --git a/options.c b/options.c
-index e7c6c61..6e72c02 100644
 --- a/options.c
 +++ b/options.c
 @@ -112,6 +112,7 @@ size_t bwlimit_writemax = 0;
@@ -88,7 +87,7 @@ index e7c6c61..6e72c02 100644
    {"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 },
-@@ -1742,6 +1747,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -1743,6 +1748,36 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        return 0;
  #endif
  
@@ -125,7 +124,7 @@ index e7c6c61..6e72c02 100644
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -2428,6 +2463,15 @@ void server_options(char **args, int *argc_p)
+@@ -2445,6 +2480,15 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -142,7 +141,6 @@ index e7c6c61..6e72c02 100644
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..6945d06 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -431,6 +431,8 @@ to the detailed description below for a complete description.  verb(
@@ -154,7 +152,7 @@ index 941f7a5..6945d06 100644
       --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
-@@ -2230,6 +2232,19 @@ transfer was too fast, it will wait before sending the next data block. The
+@@ -2257,6 +2259,19 @@ transfer was too fast, it will wait before sending the next data block. The
  result is an average transfer rate equaling the specified limit. A value
  of zero specifies no limit.
  
@@ -175,7 +173,6 @@ index 941f7a5..6945d06 100644
  another identical destination with bf(--read-batch). See the "BATCH MODE"
  section for details, and also the bf(--only-write-batch) option.
 diff --git a/util.c b/util.c
-index 0cafed6..f3e2669 100644
 --- a/util.c
 +++ b/util.c
 @@ -123,6 +123,133 @@ NORETURN void overflow_exit(const char *str)