Fixed some patch fuzz.

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index 362630e..acede4a 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -131,8 +131,8 @@ Marc St-Onge
  char backup_dir_buf[MAXPATHLEN];
 +char delete_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
+ int compare_dest = 0;
  int copy_dest = 0;
- int link_dest = 0;
 @@ -246,7 +252,9 @@ void usage(enum logcode F)
    rprintf(F,"     --no-implied-dirs       don't send implied dirs with -R\n");
    rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");

diff --git a/chmod-option.diff b/chmod-option.diff
index 8f65574..fcdec40 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -234,7 +234,7 @@ command before "make":
 +char *chmod_mode = NULL;
  char backup_dir_buf[MAXPATHLEN];
  int rsync_port = 0;
- int copy_dest = 0;
+ int compare_dest = 0;
 @@ -141,6 +142,8 @@ int list_only = 0;
  #define MAX_BATCH_NAME_LEN 256        /* Must be less than MAXPATHLEN-13 */
  char *batch_name = NULL;
@@ -243,7 +243,7 @@ command before "make":
 +
  static int daemon_opt;   /* sets am_daemon after option error-reporting */
  static int modify_window_set;
- static int compare_dest = 0;
+ static char *dest_option = NULL;
 @@ -260,6 +263,7 @@ void usage(enum logcode F)
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");