Fix failing hunks.

[rsync/rsync-patches.git] / remove-sent-files.diff

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index b500575..5bd4061 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -129,7 +129,7 @@ command before "make":
        *argc = ac;
        return;
  
---- orig/receiver.c    2004-07-23 17:16:13
+--- orig/receiver.c    2004-07-26 16:20:00
 +++ receiver.c 2004-07-26 06:21:43
 @@ -45,6 +45,7 @@ extern char *backup_dir;
  extern char *backup_suffix;
@@ -139,7 +139,7 @@ command before "make":
  extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
-@@ -338,7 +339,7 @@ int recv_files(int f_in, struct file_lis
+@@ -342,7 +343,7 @@ int recv_files(int f_in, struct file_lis
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
@@ -148,7 +148,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct file_struct *file;
        struct stats initial_stats;
-@@ -551,7 +552,12 @@ int recv_files(int f_in, struct file_lis
+@@ -555,7 +556,12 @@ int recv_files(int f_in, struct file_lis
  
                cleanup_disable();
  
@@ -162,8 +162,8 @@ command before "make":
                        int msgtype = csum_length == SUM_LENGTH || read_batch ?
                                FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
-@@ -570,9 +576,8 @@ int recv_files(int f_in, struct file_lis
-                                       errstr, fname, keptstr, redostr);
+@@ -575,9 +581,8 @@ int recv_files(int f_in, struct file_lis
+                                       keptstr, redostr);
                        }
                        if (csum_length != SUM_LENGTH) {
 -                              char buf[4];
@@ -214,8 +214,8 @@ command before "make":
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
  
---- orig/sender.c      2004-07-20 21:36:08
-+++ sender.c   2004-07-16 20:10:19
+--- orig/sender.c      2004-07-26 16:27:00
++++ sender.c   2004-07-26 16:49:19
 @@ -26,6 +26,7 @@ extern int io_error;
  extern int dry_run;
  extern int am_server;
@@ -263,10 +263,10 @@ command before "make":
        while (1) {
                unsigned int offset;
  
-@@ -246,6 +271,9 @@ void send_files(struct file_list *flist,
- 
-               if (verbose > 2)
-                       rprintf(FINFO, "sender finished %s\n", fname);
+@@ -248,6 +273,9 @@ void send_files(struct file_list *flist,
+                       rprintf(FINFO, "sender finished %s\n",
+                               safe_fname(fname));
+               }
 +
 +              /* Flag that we actually sent this entry. */
 +              file->flags |= FLAG_SENT;