Updated.

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

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index bc0546c..6d3cbe1 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/io.c  2004-07-17 15:20:05
+--- orig/io.c  2004-07-20 21:36:07
 +++ io.c       2004-07-03 20:17:10
 @@ -239,6 +239,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
@@ -38,7 +38,7 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
---- orig/main.c        2004-07-17 15:20:05
+--- orig/main.c        2004-07-19 17:14:44
 +++ main.c     2004-07-15 02:29:03
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
@@ -67,7 +67,7 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-07-20 21:36:07
 +++ options.c  2004-07-16 20:09:54
 @@ -87,8 +87,10 @@ int size_only = 0;
  int bwlimit = 0;
@@ -129,7 +129,7 @@ command before "make":
        *argc = ac;
        return;
  
---- orig/receiver.c    2004-07-16 20:07:22
+--- orig/receiver.c    2004-07-20 21:36:07
 +++ receiver.c 2004-07-16 20:09:48
 @@ -43,6 +43,7 @@ extern char *backup_dir;
  extern char *backup_suffix;
@@ -139,16 +139,16 @@ command before "make":
  extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
-@@ -311,7 +312,7 @@ int recv_files(int f_in, struct file_lis
+@@ -335,7 +336,7 @@ int recv_files(int f_in, struct file_lis
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
 -      char *fnamecmp;
 +      char *fnamecmp, numbuf[4];
        char fnamecmpbuf[MAXPATHLEN];
-       struct map_struct *mapbuf;
        struct file_struct *file;
-@@ -508,16 +509,20 @@ int recv_files(int f_in, struct file_lis
+       struct stats initial_stats;
+@@ -528,16 +529,20 @@ int recv_files(int f_in, struct file_lis
  
                cleanup_disable();
  
@@ -173,7 +173,7 @@ command before "make":
                        }
                }
        }
---- orig/rsync.h       2004-07-16 20:07:23
+--- orig/rsync.h       2004-07-20 21:36:08
 +++ rsync.h    2004-07-03 20:17:10
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
@@ -191,7 +191,7 @@ command before "make":
        MSG_DONE=5,     /* current phase is done */
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- orig/rsync.yo      2004-07-16 20:07:23
+--- orig/rsync.yo      2004-07-20 21:36:08
 +++ rsync.yo   2004-07-03 20:17:10
 @@ -314,6 +314,7 @@ verb(
       --delete                delete files that don't exist on sender
@@ -201,7 +201,7 @@ command before "make":
       --ignore-errors         delete even if there are I/O errors
       --max-delete=NUM        don't delete more than NUM files
       --partial               keep partially transferred files
-@@ -615,6 +616,11 @@ receiving side before transferring files
+@@ -618,6 +619,11 @@ receiving side before transferring files
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.
  
@@ -213,7 +213,7 @@ 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-16 20:07:23
+--- orig/sender.c      2004-07-20 21:36:08
 +++ sender.c   2004-07-16 20:10:19
 @@ -26,6 +26,7 @@ extern int io_error;
  extern int dry_run;
@@ -262,7 +262,7 @@ command before "make":
        while (1) {
                unsigned int offset;
  
-@@ -247,6 +272,9 @@ void send_files(struct file_list *flist,
+@@ -246,6 +271,9 @@ void send_files(struct file_list *flist,
  
                if (verbose > 2)
                        rprintf(FINFO, "sender finished %s\n", fname);