Updated to apply cleanly to latest CVS source.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index 00d6969..884e665 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -14,7 +14,7 @@ test suite, but otherwise UNTESTED.]
 
 --- Makefile.in        10 Feb 2004 17:06:11 -0000      1.98
 +++ Makefile.in        27 Feb 2004 08:57:09 -0000
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
  OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o \
@@ -23,23 +23,17 @@ test suite, but otherwise UNTESTED.]
  OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
---- generator.c        27 Feb 2004 08:03:49 -0000      1.76
-+++ generator.c        27 Feb 2004 08:57:09 -0000
-@@ -43,10 +43,12 @@
- extern int always_checksum;
- extern char *compare_dest;
- extern int link_dest;
+--- generator.c        15 Apr 2004 16:55:23 -0000      1.79
++++ generator.c        15 Apr 2004 19:27:47 -0000
+@@ -50,6 +50,7 @@ extern int list_only;
+ extern int only_existing;
+ extern int orig_umask;
+ extern int safe_symlinks;
 +extern int fuzzy;
  
  
  /* choose whether to skip a particular file */
--static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
-+static int skip_file(char *fname, struct file_struct *file,
-+                   const STRUCT_STAT *st)
- {
-       if (st->st_size != file->length) {
-               return 0;
-@@ -252,7 +254,62 @@
+@@ -255,7 +256,62 @@ static void generate_and_send_sums(struc
        }
  }
  
@@ -102,17 +96,16 @@ test suite, but otherwise UNTESTED.]
  
  /**
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -268,9 +325,6 @@ void recv_generator(char *fname, struct 
+@@ -271,8 +327,6 @@ void recv_generator(char *fname, struct 
        STRUCT_STAT st;
        struct map_struct *mapbuf;
        int statret;
 -      char *fnamecmp;
 -      char fnamecmpbuf[MAXPATHLEN];
--      extern char *compare_dest;
-       extern int list_only;
-       extern int only_existing;
-       extern int orig_umask;
-@@ -397,108 +451,38 @@ void recv_generator(char *fname, struct 
+ 
+       if (list_only)
+               return;
+@@ -396,108 +450,38 @@ void recv_generator(char *fname, struct 
        }
  #endif
  
@@ -241,7 +234,7 @@ test suite, but otherwise UNTESTED.]
                return;
        }
  
-@@ -508,7 +492,7 @@ void recv_generator(char *fname, struct 
+@@ -507,7 +491,7 @@ void recv_generator(char *fname, struct 
                mapbuf = NULL;
  
        if (verbose > 3) {
@@ -250,9 +243,9 @@ test suite, but otherwise UNTESTED.]
                        (double)st.st_size);
        }
  
---- options.c  22 Feb 2004 08:56:43 -0000      1.139
-+++ options.c  27 Feb 2004 08:57:10 -0000
-@@ -89,6 +89,7 @@
+--- options.c  14 Apr 2004 23:33:34 -0000      1.146
++++ options.c  15 Apr 2004 19:27:47 -0000
+@@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
@@ -260,7 +253,7 @@ test suite, but otherwise UNTESTED.]
  unsigned int block_size = 0;
  
  
-@@ -288,6 +289,7 @@ void usage(enum logcode F)
+@@ -290,6 +291,7 @@ void usage(enum logcode F)
    rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
    rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
    rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
@@ -268,7 +261,7 @@ test suite, but otherwise UNTESTED.]
    rprintf(F," -h, --help                  show this help screen\n");
  #ifdef INET6
    rprintf(F," -4                          prefer IPv4\n");
-@@ -383,6 +385,7 @@ static struct poptOption long_options[] 
+@@ -385,6 +387,7 @@ static struct poptOption long_options[] 
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
    {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
@@ -276,7 +269,7 @@ test suite, but otherwise UNTESTED.]
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
  #ifdef INET6
    {0,               '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-@@ -945,6 +948,9 @@ void server_options(char **args,int *arg
+@@ -964,6 +967,9 @@ void server_options(char **args,int *arg
                        args[ac++] = "--from0";
                }
        }
@@ -286,29 +279,17 @@ test suite, but otherwise UNTESTED.]
  
        *argc = ac;
        return;
---- proto.h    17 Feb 2004 23:13:06 -0000      1.184
-+++ proto.h    27 Feb 2004 08:57:10 -0000
-@@ -1,6 +1,9 @@
- /* This file is automatically generated with "make proto". DO NOT EDIT */
- 
- int allow_access(char *addr, char *host, char *allow_list, char *deny_list);
-+int do_open_regular(char *fname);
-+int open_alternate_base_fuzzy(const char *fname);
-+int open_alternate_base_comparedir(const char *fname);
- void base64_encode(char *buf, int len, char *out);
- char *auth_server(int f_in, int f_out, int module, char *addr, char *leader);
- void auth_client(int fd, char *user, char *challenge);
---- receiver.c 27 Feb 2004 08:03:49 -0000      1.73
-+++ receiver.c 27 Feb 2004 08:57:10 -0000
-@@ -39,6 +39,7 @@
- extern char *backup_suffix;
- extern int backup_suffix_len;
- extern int cleanup_got_literal;
+--- receiver.c 23 Mar 2004 16:50:40 -0000      1.75
++++ receiver.c 15 Apr 2004 19:25:05 -0000
+@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
+ extern int module_id;
+ extern int ignore_errors;
+ extern int orig_umask;
 +extern int fuzzy;
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -288,8 +289,6 @@ int recv_files(int f_in,struct file_list
+@@ -292,8 +293,6 @@ int recv_files(int f_in,struct file_list
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];