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 4b21eff..399c1a4 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,8 +4,8 @@ command before "make":
     make proto
 
 
---- io.c       9 Jun 2004 03:07:50 -0000       1.129
-+++ io.c       18 Jun 2004 17:24:12 -0000
+--- io.c       23 Jun 2004 01:13:09 -0000      1.131
++++ io.c       30 Jun 2004 00:07:33 -0000
 @@ -225,6 +225,14 @@ static void read_msg_fd(void)
                read_loop(fd, buf, 4);
                redo_list_add(IVAL(buf,0));
@@ -21,7 +21,7 @@ command before "make":
        case MSG_INFO:
        case MSG_ERROR:
        case MSG_LOG:
-@@ -636,6 +644,16 @@ static int readfd_unbuffered(int fd, cha
+@@ -634,6 +642,16 @@ static int readfd_unbuffered(int fd, cha
                        read_loop(fd, buffer, remaining);
                        bufferIdx = 0;
                        break;
@@ -38,8 +38,8 @@ command before "make":
                case MSG_INFO:
                case MSG_ERROR:
                        if (remaining >= sizeof line) {
---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:24:12 -0000
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:07:33 -0000
 @@ -42,6 +42,7 @@ extern int list_only;
  extern int local_server;
  extern int log_got_error;
@@ -48,7 +48,7 @@ command before "make":
  extern int orig_umask;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
-@@ -575,6 +576,8 @@ void start_server(int f_in, int f_out, i
+@@ -585,6 +586,8 @@ void start_server(int f_in, int f_out, i
  
        if (am_sender) {
                keep_dirlinks = 0; /* Must be disabled on the sender. */
@@ -57,7 +57,7 @@ command before "make":
                if (!read_batch) {
                        recv_exclude_list(f_in);
                        if (cvs_exclude)
-@@ -642,6 +645,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -652,6 +655,9 @@ int client_run(int f_in, int f_out, pid_
                exit_cleanup(status);
        }
  
@@ -67,8 +67,8 @@ command before "make":
        if (argc == 0)
                list_only = 1;
  
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:24:12 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:07:33 -0000
 @@ -87,6 +87,7 @@ int size_only = 0;
  int bwlimit = 0;
  size_t bwlimit_writemax = 0;
@@ -134,8 +134,8 @@ command before "make":
        *argc = ac;
        return;
  
---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:24:13 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:07:33 -0000
 @@ -48,6 +48,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
@@ -153,7 +153,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
        struct file_struct *file;
-@@ -482,16 +483,20 @@ int recv_files(int f_in,struct file_list
+@@ -484,16 +485,20 @@ int recv_files(int f_in,struct file_list
  
                cleanup_disable();
  
@@ -179,7 +179,7 @@ command before "make":
                }
        }
 --- rsync.h    16 May 2004 07:28:24 -0000      1.204
-+++ rsync.h    18 Jun 2004 17:24:13 -0000
++++ rsync.h    30 Jun 2004 00:07:34 -0000
 @@ -60,6 +60,7 @@
  #define FLAG_TOP_DIR (1<<0)
  #define FLAG_HLINK_EOL (1<<1) /* generator only */
@@ -197,7 +197,7 @@ command before "make":
        MSG_REDO=4,     /* reprocess indicated flist index */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   18 Jun 2004 17:24:14 -0000
++++ rsync.yo   30 Jun 2004 00:07:34 -0000
 @@ -313,6 +313,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver
@@ -219,7 +219,7 @@ command before "make":
  even when there are I/O errors.
  
 --- sender.c   18 Jun 2004 16:55:12 -0000      1.41
-+++ sender.c   18 Jun 2004 17:24:14 -0000
++++ sender.c   30 Jun 2004 00:07:34 -0000
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int am_server;
  extern int am_daemon;