Updated patches to work with the current trunk.

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

diff --git a/slow-down.diff b/slow-down.diff
index 39ec240..fa29d74 100644 (file)
--- a/slow-down.diff
+++ b/slow-down.diff
@@ -15,17 +15,18 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/flist.c b/flist.c
+index 09b4fc5..a8847a2 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -69,6 +69,7 @@ extern int munge_symlinks;
- extern int need_unsorted_flist;
- extern int sender_symlink_iconv;
+@@ -71,6 +71,7 @@ extern int sender_symlink_iconv;
+ extern int output_needs_newline;
+ extern int sender_keeps_checksum;
  extern int unsort_ndx;
 +extern unsigned long sleep_asec;
  extern struct stats stats;
  extern char *filesfrom_host;
- 
-@@ -1631,6 +1632,9 @@ static void send_directory(int f, struct file_list *flist, char *fbuf, int len,
+ extern char *usermap, *groupmap;
+@@ -1704,6 +1705,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);
@@ -36,9 +37,10 @@ diff --git a/flist.c b/flist.c
  
        fbuf[len] = '\0';
 diff --git a/options.c b/options.c
+index e7c6c61..762a167 100644
 --- a/options.c
 +++ b/options.c
-@@ -109,6 +109,7 @@ int size_only = 0;
+@@ -108,6 +108,7 @@ int size_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
@@ -46,7 +48,7 @@ diff --git a/options.c b/options.c
  size_t bwlimit_writemax = 0;
  int ignore_existing = 0;
  int ignore_non_existing = 0;
-@@ -425,6 +426,7 @@ void usage(enum logcode F)
+@@ -775,6 +776,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=KBPS          limit I/O bandwidth; KBytes per second\n");
@@ -54,7 +56,7 @@ diff --git a/options.c b/options.c
    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");
-@@ -605,6 +607,7 @@ static struct poptOption long_options[] = {
+@@ -963,6 +965,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 },