Updated to apply to latest source.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index ebdbae4..4335552 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -16,7 +16,7 @@ Be sure to run "make proto" before "make".
  extern int always_checksum;
  extern char *compare_dest;
  extern int link_dest;
-@@ -257,6 +258,94 @@ static void generate_and_send_sums(struc
+@@ -238,6 +239,94 @@ static void generate_and_send_sums(struc
  }
  
  
@@ -111,7 +111,7 @@ Be sure to run "make proto" before "make".
  
  /*
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -272,7 +361,7 @@ static void recv_generator(char *fname, 
+@@ -253,7 +342,7 @@ static void recv_generator(char *fname, 
        int fd;
        STRUCT_STAT st;
        struct map_struct *mapbuf;
@@ -120,7 +120,7 @@ Be sure to run "make proto" before "make".
        char *fnamecmp;
        char fnamecmpbuf[MAXPATHLEN];
  
-@@ -452,6 +541,14 @@ static void recv_generator(char *fname, 
+@@ -436,6 +525,14 @@ static void recv_generator(char *fname, 
        } else
                *fnamecmpbuf = '\0';
  
@@ -135,7 +135,7 @@ Be sure to run "make proto" before "make".
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
-@@ -498,7 +595,7 @@ static void recv_generator(char *fname, 
+@@ -482,7 +579,7 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -144,7 +144,7 @@ Be sure to run "make proto" before "make".
                if (!*fnamecmpbuf)
                        set_perms(fname, file, &st, PERMS_REPORT);
                return;
---- orig/options.c     2004-06-20 19:30:00
+--- orig/options.c     2004-07-15 16:51:50
 +++ options.c  2004-07-03 19:27:25
 @@ -94,6 +94,7 @@ int ignore_errors = 0;
  int modify_window = 0;
@@ -154,7 +154,7 @@ Be sure to run "make proto" before "make".
  unsigned int block_size = 0;
  
  
-@@ -270,6 +271,7 @@ void usage(enum logcode F)
+@@ -269,6 +270,7 @@ void usage(enum logcode F)
    rprintf(F," -T  --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --link-dest=DIR         create hardlinks to DIR for unchanged files\n");
@@ -162,7 +162,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");
-@@ -368,6 +370,7 @@ static struct poptOption long_options[] 
+@@ -367,6 +369,7 @@ static struct poptOption long_options[] 
    {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
    {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
@@ -170,7 +170,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 },
    {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
-@@ -989,6 +992,9 @@ void server_options(char **args,int *arg
+@@ -981,6 +984,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -190,7 +190,7 @@ Be sure to run "make proto" before "make".
  extern int make_backups;
  extern int do_progress;
  extern char *backup_dir;
---- orig/rsync.yo      2004-06-17 06:32:00
+--- orig/rsync.yo      2004-07-15 02:21:11
 +++ rsync.yo   2004-07-03 19:27:25
 @@ -325,6 +325,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR