Fixed the code that complains if --fuzzy is combined with --inplace.

diff --git a/fuzzy.diff b/fuzzy.diff
index 0829e0d..485f9d9 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -177,8 +177,8 @@ Be sure to run "make proto" before "make".
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
---- orig/options.c     2004-11-27 17:53:24
-+++ options.c  2004-11-27 18:14:43
+--- orig/options.c     2004-11-27 18:27:35
++++ options.c  2004-11-29 01:36:48
 @@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
  int daemon_bwlimit = 0;
@@ -203,19 +203,20 @@ Be sure to run "make proto" before "make".
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
    {"stats",            0,  POPT_ARG_NONE,   &do_stats, 0, 0, 0 },
-@@ -963,6 +966,11 @@ int parse_arguments(int *argc, const cha
-                                dest_option);
+@@ -957,10 +960,10 @@ int parse_arguments(int *argc, const cha
+                        am_server ? "server" : "client");
+               return 0;
+ #endif
+-              if (compare_dest || copy_dest || link_dest) {
++              if (dest_option || fuzzy_basis) {
+                       snprintf(err_buf, sizeof err_buf,
+                                "--inplace does not yet work with %s\n",
+-                               dest_option);
++                               dest_option ? dest_option : "--fuzzy");
                        return 0;
                }
-+              if (compare_dest) {
-+                      snprintf(err_buf, sizeof err_buf,
-+                               "--inplace does not yet work with --fuzzy\n");
-+                      return 0;
-+              }
        } else {
-               if (keep_partial && !partial_dir)
-                       partial_dir = getenv("RSYNC_PARTIAL_DIR");
-@@ -1237,6 +1245,9 @@ void server_options(char **args,int *arg
+@@ -1237,6 +1240,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -276,7 +277,7 @@ Be sure to run "make proto" before "make".
  
  
  /* Log-message categories.  FLOG is only used on the daemon side to
---- orig/rsync.yo      2004-11-27 17:53:24
+--- orig/rsync.yo      2004-11-29 01:31:40
 +++ rsync.yo   2004-11-27 18:15:22
 @@ -358,6 +358,7 @@ verb(
       --compare-dest=DIR      also compare received files relative to DIR