Moved some variable-init code into g2r-basis-filename.diff.

diff --git a/fuzzy.diff b/fuzzy.diff
index a8cdaef..43b80e5 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -6,7 +6,7 @@ Very lightly tested.
 
 Be sure to run "make proto" before "make".
 
---- orig/generator.c   2004-09-20 19:57:58
+--- orig/generator.c   2004-10-09 04:06:49
 +++ generator.c        2004-09-23 15:33:08
 @@ -43,6 +43,7 @@ extern int ignore_times;
  extern int size_only;
@@ -109,22 +109,7 @@ Be sure to run "make proto" before "make".
  
  /*
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -256,11 +343,11 @@ static void generate_and_send_sums(int f
- static void recv_generator(char *fname, struct file_struct *file, int i,
-                          int f_out, int f_out_name)
- {
--      int fd = -1, f_copy;
-+      int fd = -1, f_copy = -1;
-       STRUCT_STAT st, partial_st;
--      struct file_struct *back_file;
-+      struct file_struct *back_file = NULL;
-       int statret, stat_errno;
--      char *fnamecmp, *partialptr, *backupptr;
-+      char *fnamecmp, *partialptr, *backupptr = NULL;
-       char fnamecmpbuf[MAXPATHLEN];
-       uchar fnamecmp_type;
- 
-@@ -468,6 +555,15 @@ static void recv_generator(char *fname, 
+@@ -466,6 +553,15 @@ static void recv_generator(char *fname, 
        } else
                partialptr = NULL;
  
@@ -140,7 +125,7 @@ Be sure to run "make proto" before "make".
        if (statret == -1) {
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
-@@ -494,7 +590,7 @@ static void recv_generator(char *fname, 
+@@ -492,7 +588,7 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -149,18 +134,7 @@ Be sure to run "make proto" before "make".
                if (fnamecmp_type == G2R_FNAME)
                        set_perms(fname, file, &st, PERMS_REPORT);
                return;
-@@ -553,10 +649,6 @@ prepare_to_open:
-                       return;
-               }
-               fnamecmp_type = G2R_BACKUP;
--      } else {
--              backupptr = NULL;
--              back_file = NULL;
--              f_copy = -1;
-       }
- 
-       if (verbose > 3) {
-@@ -570,6 +662,21 @@ prepare_to_open:
+@@ -564,6 +660,21 @@ prepare_to_open:
  notify_others:
        if (f_out_name >= 0) {
                write_byte(f_out_name, fnamecmp_type);
@@ -182,7 +156,7 @@ Be sure to run "make proto" before "make".
                io_flush(NORMAL_FLUSH); /* XXX make this more efficient! */
        }
  
---- orig/main.c        2004-07-22 00:10:43
+--- orig/main.c        2004-10-09 03:25:43
 +++ main.c     2004-07-22 00:32:31
 @@ -48,6 +48,7 @@ extern int keep_dirlinks;
  extern int preserve_hard_links;
@@ -201,7 +175,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-09-23 17:42:07
+--- orig/options.c     2004-10-08 20:16:26
 +++ options.c  2004-09-23 14:59:46
 @@ -85,6 +85,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
@@ -300,7 +274,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-09-24 16:42:30
+--- orig/rsync.yo      2004-10-06 00:12:16
 +++ rsync.yo   2004-07-03 19:27:25
 @@ -356,6 +356,7 @@ verb(
   -T  --temp-dir=DIR          create temporary files in directory DIR