Updated to apply cleanly.

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

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 7d32641..38143e4 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -1,5 +1,5 @@
---- io.c       16 Jan 2004 16:31:47 -0000      1.119
-+++ io.c       24 Apr 2004 07:35:03 -0000
+--- io.c       8 May 2004 18:03:43 -0000       1.120
++++ io.c       8 May 2004 18:48:44 -0000
 @@ -222,6 +222,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
                redo_list_add(IVAL(buf,0));
@@ -33,7 +33,7 @@
                case MSG_INFO:
                case MSG_ERROR:
 --- main.c     10 Feb 2004 03:54:47 -0000      1.192
-+++ main.c     24 Apr 2004 07:35:04 -0000
++++ main.c     8 May 2004 18:48:45 -0000
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
  extern int log_got_error;
@@ -61,8 +61,8 @@
  
        if (argc == 0) {
                list_only = 1;
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  24 Apr 2004 07:35:04 -0000
+--- options.c  6 May 2004 21:08:01 -0000       1.148
++++ options.c  8 May 2004 18:48:45 -0000
 @@ -84,6 +84,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
  int bwlimit = 0;
@@ -129,7 +129,7 @@
        *argc = ac;
        return;
 --- proto.h    22 Apr 2004 09:58:09 -0000      1.189
-+++ proto.h    24 Apr 2004 07:35:04 -0000
++++ proto.h    8 May 2004 18:48:45 -0000
 @@ -197,6 +197,7 @@ void sig_int(void);
  void finish_transfer(char *fname, char *fnametmp, struct file_struct *file);
  const char *who_am_i(void);
@@ -138,8 +138,8 @@
  void send_files(struct file_list *flist, int f_out, int f_in);
  int try_bind_local(int s, int ai_family, int ai_socktype,
                   const char *bind_address);
---- receiver.c 23 Mar 2004 16:50:40 -0000      1.75
-+++ receiver.c 24 Apr 2004 07:35:04 -0000
+--- receiver.c 27 Apr 2004 19:51:33 -0000      1.76
++++ receiver.c 8 May 2004 18:48:45 -0000
 @@ -45,6 +45,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
@@ -157,7 +157,7 @@
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
        int i;
-@@ -467,16 +468,20 @@ int recv_files(int f_in,struct file_list
+@@ -471,16 +472,20 @@ int recv_files(int f_in,struct file_list
  
                cleanup_disable();
  
@@ -182,8 +182,8 @@
                        }
                }
        }
---- rsync.h    22 Apr 2004 09:58:24 -0000      1.198
-+++ rsync.h    24 Apr 2004 07:35:04 -0000
+--- rsync.h    8 May 2004 18:48:09 -0000       1.201
++++ rsync.h    8 May 2004 18:48:45 -0000
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
  #define FLAG_HLINK_EOL (1<<1) /* generator only */
@@ -192,16 +192,16 @@
  
  /* update this if you make incompatible changes */
  #define PROTOCOL_VERSION 28
-@@ -124,6 +125,7 @@ enum msgcode {
-       MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
-       MSG_REDO=4,     /* reprocess indicated flist index */
-       MSG_DONE=5,     /* current phase is done */
+@@ -120,6 +121,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+ /* Messages types that are sent over the message channel.  The logcode
+  * values must all be present here with identical numbers. */
+ enum msgcode {
 +      MSG_SUCCESS=6,  /* successfully updated indicated flist index */
- };
- 
- #include "errcode.h"
---- rsync.yo   24 Apr 2004 06:16:04 -0000      1.164
-+++ rsync.yo   24 Apr 2004 07:35:05 -0000
+       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 */
+--- rsync.yo   7 May 2004 00:18:37 -0000       1.169
++++ rsync.yo   8 May 2004 18:48:46 -0000
 @@ -312,6 +312,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver
@@ -210,7 +210,7 @@
       --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
-@@ -594,6 +595,11 @@ dit(bf(--delete-after)) By default rsync
+@@ -596,6 +597,11 @@ dit(bf(--delete-after)) By default rsync
  receiving side before transferring files to try to ensure that there is
  sufficient space on the receiving filesystem. If you want to delete
  after transferring, use the --delete-after switch. Implies --delete.
@@ -223,7 +223,7 @@
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
 --- sender.c   17 Feb 2004 21:57:44 -0000      1.38
-+++ sender.c   24 Apr 2004 07:35:05 -0000
++++ sender.c   8 May 2004 18:48:46 -0000
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int am_server;
  extern int am_daemon;