Fixed fuzzy hunks.

[rsync/rsync-patches.git] / fuzzy.diff

diff --git a/fuzzy.diff b/fuzzy.diff
index 485f9d9..828575c 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -4,7 +4,7 @@ Lightly tested.
 
 Be sure to run "make proto" before "make".
 
---- orig/generator.c   2004-11-27 17:53:24
+--- orig/generator.c   2005-01-01 21:11:00
 +++ generator.c        2004-11-27 18:12:57
 @@ -44,6 +44,7 @@ extern int size_only;
  extern OFF_T max_size;
@@ -14,7 +14,7 @@ Be sure to run "make proto" before "make".
  extern int always_checksum;
  extern char *partial_dir;
  extern char *basis_dir[];
-@@ -247,6 +248,92 @@ static void generate_and_send_sums(int f
+@@ -239,6 +240,92 @@ static void generate_and_send_sums(int f
  }
  
  
@@ -107,7 +107,7 @@ Be sure to run "make proto" before "make".
  
  /*
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -501,6 +588,15 @@ static void recv_generator(char *fname, 
+@@ -493,6 +580,15 @@ static void recv_generator(char *fname, 
        } else
                partialptr = NULL;
  
@@ -123,7 +123,7 @@ Be sure to run "make proto" before "make".
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
-@@ -529,6 +625,8 @@ static void recv_generator(char *fname, 
+@@ -521,6 +617,8 @@ static void recv_generator(char *fname, 
  
        if ((link_dest || copy_dest) && fnamecmp_type != FNAMECMP_FNAME)
                ;
@@ -132,7 +132,7 @@ Be sure to run "make proto" before "make".
        else if (unchanged_file(fnamecmp, file, &st)) {
                if (fnamecmp_type == FNAMECMP_FNAME)
                        set_perms(fname, file, &st, PERMS_REPORT);
-@@ -600,8 +698,24 @@ prepare_to_open:
+@@ -592,8 +690,24 @@ prepare_to_open:
  
  notify_others:
        write_int(f_out, i);
@@ -158,7 +158,7 @@ Be sure to run "make proto" before "make".
  
        if (dry_run || read_batch)
                return;
---- orig/main.c        2004-11-27 17:53:24
+--- orig/main.c        2005-01-01 21:11:00
 +++ main.c     2004-11-27 18:13:51
 @@ -48,6 +48,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
@@ -177,7 +177,7 @@ 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 18:27:35
+--- orig/options.c     2005-01-01 21:11:00
 +++ options.c  2004-11-29 01:36:48
 @@ -86,6 +86,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
@@ -195,7 +195,7 @@ Be sure to run "make proto" before "make".
    rprintf(F," -P                          equivalent to --partial --progress\n");
    rprintf(F," -z, --compress              compress file data\n");
    rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
-@@ -383,6 +385,7 @@ static struct poptOption long_options[] 
+@@ -384,6 +386,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -203,7 +203,7 @@ 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 },
-@@ -957,10 +960,10 @@ int parse_arguments(int *argc, const cha
+@@ -958,10 +961,10 @@ int parse_arguments(int *argc, const cha
                         am_server ? "server" : "client");
                return 0;
  #endif
@@ -216,8 +216,8 @@ Be sure to run "make proto" before "make".
                        return 0;
                }
        } else {
-@@ -1237,6 +1240,9 @@ void server_options(char **args,int *arg
-               }
+@@ -1240,6 +1243,9 @@ void server_options(char **args,int *arg
+                       args[ac++] = "--no-relative";
        }
  
 +      if (fuzzy_basis && am_sender)
@@ -226,9 +226,9 @@ Be sure to run "make proto" before "make".
        *argc = ac;
        return;
  
---- orig/receiver.c    2004-11-27 17:57:31
+--- orig/receiver.c    2005-01-01 21:11:00
 +++ receiver.c 2004-11-27 18:15:01
-@@ -320,6 +320,27 @@ static int receive_data(int f_in, char *
+@@ -323,6 +323,27 @@ static int receive_data(int f_in, char *
  }
  
  
@@ -256,7 +256,7 @@ Be sure to run "make proto" before "make".
  static void discard_receive_data(int f_in, OFF_T length)
  {
        receive_data(f_in, NULL, -1, 0, NULL, -1, length);
-@@ -450,6 +471,10 @@ int recv_files(int f_in, struct file_lis
+@@ -453,6 +474,10 @@ int recv_files(int f_in, struct file_lis
                        case FNAMECMP_BACKUP:
                                fnamecmp = get_backup_name(fname);
                                break;
@@ -267,7 +267,7 @@ Be sure to run "make proto" before "make".
                        case FNAMECMP_BASIS_DIR:
                        default:
                                pathjoin(fnamecmpbuf, sizeof fnamecmpbuf,
---- orig/rsync.h       2004-11-27 17:53:24
+--- orig/rsync.h       2005-01-01 21:11:01
 +++ rsync.h    2004-11-03 22:53:09
 @@ -125,6 +125,7 @@
  #define FNAMECMP_FNAME                0x80
@@ -277,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-29 01:31:40
+--- orig/rsync.yo      2005-01-01 21:11:01
 +++ rsync.yo   2004-11-27 18:15:22
 @@ -358,6 +358,7 @@ verb(
       --compare-dest=DIR      also compare received files relative to DIR