Fixed failed hunks.

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

diff --git a/fuzzy.diff b/fuzzy.diff
index 0bae7d3..75fe2c9 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -13,7 +13,7 @@ test suite, but otherwise UNTESTED.]
   Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
 
 --- Makefile.in        2 May 2004 17:04:14 -0000       1.100
-+++ Makefile.in        8 May 2004 18:41:35 -0000
++++ Makefile.in        13 May 2004 19:15:31 -0000
 @@ -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
@@ -23,8 +23,8 @@ 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        5 May 2004 17:15:03 -0000       1.81
-+++ generator.c        8 May 2004 18:41:36 -0000
+--- generator.c        13 May 2004 06:55:01 -0000      1.82
++++ generator.c        13 May 2004 19:15:31 -0000
 @@ -51,6 +51,7 @@ extern int list_only;
  extern int only_existing;
  extern int orig_umask;
@@ -52,7 +52,7 @@ test suite, but otherwise UNTESTED.]
 +                              return -2;
 +                      }
 +                      if (skip_file(fname, file, st)) {
-+                              set_perms(fname, file, st, 1);
++                              set_perms(fname, file, st, PERMS_REPORT);
 +                              return -2;
 +                      }
 +                      fd = do_open(fname, O_RDONLY, 0);
@@ -105,7 +105,7 @@ test suite, but otherwise UNTESTED.]
  
        if (list_only)
                return;
-@@ -397,108 +451,38 @@ void recv_generator(char *fname, struct 
+@@ -398,108 +452,38 @@ void recv_generator(char *fname, struct 
        }
  #endif
  
@@ -193,7 +193,7 @@ test suite, but otherwise UNTESTED.]
  
 -      if (skip_file(fname, file, &st)) {
 -              if (fnamecmp == fname)
--                      set_perms(fname,file,&st,1);
+-                      set_perms(fname, file, &st, PERMS_REPORT);
 -              return;
 -      }
 -
@@ -234,7 +234,7 @@ test suite, but otherwise UNTESTED.]
                return;
        }
  
-@@ -508,7 +492,7 @@ void recv_generator(char *fname, struct 
+@@ -509,7 +493,7 @@ void recv_generator(char *fname, struct 
                mapbuf = NULL;
  
        if (verbose > 3) {
@@ -244,7 +244,7 @@ test suite, but otherwise UNTESTED.]
        }
  
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  8 May 2004 18:41:36 -0000
++++ options.c  13 May 2004 19:15:32 -0000
 @@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -279,17 +279,17 @@ test suite, but otherwise UNTESTED.]
  
        *argc = ac;
        return;
---- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
-+++ receiver.c 8 May 2004 18:41:36 -0000
-@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
- extern int module_id;
+--- receiver.c 13 May 2004 07:08:22 -0000      1.77
++++ receiver.c 13 May 2004 19:15:32 -0000
+@@ -46,6 +46,7 @@ extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
+ extern int keep_partial;
 +extern int fuzzy;
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -292,8 +293,6 @@ int recv_files(int f_in,struct file_list
+@@ -293,8 +294,6 @@ int recv_files(int f_in,struct file_list
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
@@ -298,7 +298,7 @@ test suite, but otherwise UNTESTED.]
        struct map_struct *mapbuf;
        int i;
        struct file_struct *file;
-@@ -356,35 +355,31 @@ int recv_files(int f_in,struct file_list
+@@ -357,35 +356,31 @@ int recv_files(int f_in,struct file_list
                if (verbose > 2)
                        rprintf(FINFO,"recv_files(%s)\n",fname);
  
@@ -343,7 +343,7 @@ test suite, but otherwise UNTESTED.]
                        receive_data(f_in, NULL, -1, NULL, file->length);
                        close(fd1);
                        continue;
-@@ -405,8 +400,10 @@ int recv_files(int f_in,struct file_list
+@@ -406,8 +401,10 @@ int recv_files(int f_in,struct file_list
  
                if (fd1 != -1 && st.st_size > 0) {
                        mapbuf = map_file(fd1,st.st_size);