Fixed some patch fuzz.

[rsync/rsync-patches.git] / detect-renamed.diff

diff --git a/detect-renamed.diff b/detect-renamed.diff
index d700d57..6c300b1 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -300,9 +300,9 @@ TODO:
        save_filters = push_local_filters(fname, dlen);
  
        non_perishable_cnt = 0;
-+      flist_extra_cnt += SUM_EXTRA_CNT;
++      file_extra_cnt += SUM_EXTRA_CNT;
        dirlist = get_dirlist(fname, dlen, 0);
-+      flist_extra_cnt -= SUM_EXTRA_CNT;
++      file_extra_cnt -= SUM_EXTRA_CNT;
        ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
  
        if (!dirlist->count)
@@ -350,7 +350,7 @@ TODO:
 @@ -434,12 +561,14 @@ static void delete_in_dir(struct file_li
                return; /* Impossible... */
  
-       if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+       if (io_error && !ignore_errors) {
 -              if (already_warned)
 +              if (!already_warned) {
 +                      rprintf(FINFO,