Fixed failing hunks.

diff --git a/atimes.diff b/atimes.diff
index 7fe98b2..b49ccc8 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -532,7 +532,7 @@ To use this patch, run these commands for a successful build:
 +
 +static void tls_usage(int ret)
 +{
-+      fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
++      fprintf(stderr, "usage: " PROGRAM " [--atime | -u] FILE ...\n"
 +          "Trivial file listing program for portably checking rsync\n");
 +      exit(ret);
  }
@@ -541,7 +541,7 @@ To use this patch, run these commands for a successful build:
  main(int argc, char *argv[])
  {
 -      if (argc < 2) {
--              fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+-              fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
 -                      "Trivial file listing program for portably checking rsync\n");
 -              return 1;
 -      }

diff --git a/detect-renamed.diff b/detect-renamed.diff
index d851dd6..6c300b1 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -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,