The patches for 3.3.0.

[rsync-patches.git] / slow-down.diff

diff --git a/slow-down.diff b/slow-down.diff
index 731944cfcac01a4f978d30cd8379db7c664e77ae..f876251d3c6ac6e62e882d048e35ec0635285061 100644 (file)
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -14,19 +14,19 @@ To use this patch, run these commands for a successful build:
     ./configure                           (optional if already run)
     make
 
-based-on: a59a7b242393699fedeb4f66911e3fc9b4fadd73
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -69,6 +69,7 @@ extern int sender_symlink_iconv;
- extern int output_needs_newline;
+@@ -74,6 +74,7 @@ extern int output_needs_newline;
  extern int sender_keeps_checksum;
+ extern int trust_sender_filter;
  extern int unsort_ndx;
 +extern unsigned long sleep_asec;
  extern uid_t our_uid;
  extern struct stats stats;
  extern char *filesfrom_host;
-@@ -1751,6 +1752,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+@@ -1879,6 +1880,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
                }
  
                send_file_name(f, flist, fbuf, NULL, flags, filter_level);
@@ -39,7 +39,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -109,6 +109,7 @@ int size_only = 0;
+@@ -122,6 +122,7 @@ int size_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
@@ -47,15 +47,7 @@ diff --git a/options.c b/options.c
  size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
-@@ -788,6 +789,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --password-file=FILE    read daemon-access password from FILE\n");
-   rprintf(F,"     --list-only             list the files instead of copying them\n");
-   rprintf(F,"     --bwlimit=RATE          limit socket I/O bandwidth\n");
-+  rprintf(F,"     --slow-down=USECs       sleep N usec while creating the filelist\n");
-   rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
-   rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
-   rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
-@@ -980,6 +982,7 @@ static struct poptOption long_options[] = {
+@@ -774,6 +775,7 @@ static struct poptOption long_options[] = {
    {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
    {"no-itemize-changes",0, POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
    {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
@@ -63,3 +55,14 @@ diff --git a/options.c b/options.c
    {"bwlimit",          0,  POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
    {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
    {"backup",          'b', POPT_ARG_VAL,    &make_backups, 1, 0, 0 },
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -547,6 +547,7 @@ has its own detailed description later in this manpage.
+ --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
++--slow-down=USECs        sleep N usec while creating the filelist
+ --stop-after=MINS        Stop rsync after MINS minutes have elapsed
+ --stop-at=y-m-dTh:m      Stop rsync at the specified point in time
+ --fsync                  fsync every written file