Updated to apply over the latest g2r-basis-filename.diff patch.

[rsync/rsync-patches.git] / compare-dest.diff

diff --git a/compare-dest.diff b/compare-dest.diff
index a6e84bd..342a534 100644 (file)
--- a/compare-dest.diff
+++ b/compare-dest.diff
@@ -9,8 +9,8 @@ they are suppled).
 
 Before compiling, be sure to run "make proto".
 
---- orig/generator.c   2004-07-03 20:08:07
-+++ generator.c        2004-07-03 20:14:37
+--- orig/generator.c   2004-07-17 15:50:09
++++ generator.c        2004-07-19 08:32:53
 @@ -42,7 +42,7 @@ extern int size_only;
  extern int io_timeout;
  extern int protocol_version;
@@ -39,7 +39,7 @@ Before compiling, be sure to run "make proto".
                }
                file_checksum(fname,sum,st->st_size);
                return memcmp(sum, file->u.sum, protocol_version < 21 ? 2
-@@ -411,13 +410,18 @@ static void recv_generator(char *fname, 
+@@ -408,13 +407,18 @@ static void recv_generator(char *fname, 
  
        fnamecmp = fname;
  
@@ -60,9 +60,29 @@ Before compiling, be sure to run "make proto".
 +                              statret = -1;
 +                      }
 +              }
-               if (statret < 0) {
+               if (statret == -1) {
                        errno = saveerrno;
                        *fnamecmpbuf = '\0';
+--- orig/main.c        2004-07-17 15:58:11
++++ main.c     2004-07-17 16:31:30
+@@ -57,7 +57,7 @@ extern int filesfrom_fd;
+ extern pid_t cleanup_child_pid;
+ extern char *files_from;
+ extern char *remote_filesfrom_file;
+-extern char *compare_dest;
++extern char *compare_dest[];
+ extern char *rsync_path;
+ extern char *shell_cmd;
+ extern char *batch_name;
+@@ -446,7 +446,7 @@ static int do_recv(int f_in,int f_out,st
+       int pid;
+       int status = 0;
+       int error_pipe[2], name_pipe[2];
+-      int need_name_pipe = compare_dest || read_batch;
++      int need_name_pipe = compare_dest[0] || read_batch;
+ 
+       if (preserve_hard_links)
+               init_hard_links(flist);
 --- orig/options.c     2004-07-16 20:07:22
 +++ options.c  2004-07-03 17:33:30
 @@ -118,7 +118,8 @@ unsigned int backup_dir_remainder;
@@ -191,9 +211,9 @@ Before compiling, be sure to run "make proto".
        }
  
        if (files_from && (!am_sender || remote_filesfrom_file)) {
---- orig/receiver.c    2004-07-03 20:08:07
+--- orig/receiver.c    2004-07-17 21:27:55
 +++ receiver.c 2004-07-03 20:14:37
-@@ -36,7 +36,6 @@ extern int preserve_perms;
+@@ -37,7 +37,6 @@ extern int preserve_perms;
  extern int cvs_exclude;
  extern int io_error;
  extern char *tmpdir;