Fixed failing hunks and/or fuzz.

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

diff --git a/remove-sent-files.diff b/remove-sent-files.diff
index 9eaf7a0..03cd8ae 100644 (file)
--- a/remove-sent-files.diff
+++ b/remove-sent-files.diff
@@ -4,8 +4,8 @@ command before "make":
     make proto
 
 
---- io.c       8 May 2004 18:03:43 -0000       1.120
-+++ io.c       13 May 2004 18:57:54 -0000
+--- io.c       15 May 2004 19:31:10 -0000      1.121
++++ io.c       15 May 2004 20:15:14 -0000
 @@ -222,6 +222,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:
-@@ -637,6 +645,16 @@ static int read_unbuffered(int fd, char 
+@@ -635,6 +643,16 @@ static int read_unbuffered(int fd, char 
                        }
                        read_loop(fd, buffer, remaining);
                        bufferIdx = 0;
@@ -38,8 +38,8 @@ command before "make":
                        break;
                case MSG_INFO:
                case MSG_ERROR:
---- main.c     10 Feb 2004 03:54:47 -0000      1.192
-+++ main.c     13 May 2004 18:57:54 -0000
+--- main.c     15 May 2004 19:31:10 -0000      1.194
++++ main.c     15 May 2004 20:15:15 -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 preserve_hard_links;
  extern int protocol_version;
-@@ -567,6 +568,8 @@ void start_server(int f_in, int f_out, i
+@@ -566,6 +567,8 @@ void start_server(int f_in, int f_out, i
                io_start_multiplex_out(f_out);
  
        if (am_sender) {
@@ -57,7 +57,7 @@ command before "make":
                if (!read_batch) {
                        recv_exclude_list(f_in);
                        if (cvs_exclude)
-@@ -632,6 +635,9 @@ int client_run(int f_in, int f_out, pid_
+@@ -631,6 +634,9 @@ int client_run(int f_in, int f_out, pid_
                io_flush(FULL_FLUSH);
                exit_cleanup(status);
        }
@@ -65,10 +65,10 @@ command before "make":
 +      if (need_messages_from_generator)
 +              io_start_multiplex_out(f_out);
  
-       if (argc == 0) {
+       if (argc == 0)
                list_only = 1;
 --- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  13 May 2004 18:57:55 -0000
++++ options.c  15 May 2004 20:15:15 -0000
 @@ -84,6 +84,7 @@ int copy_unsafe_links = 0;
  int size_only = 0;
  int bwlimit = 0;
@@ -134,8 +134,8 @@ command before "make":
  
        *argc = ac;
        return;
---- receiver.c 13 May 2004 07:08:22 -0000      1.77
-+++ receiver.c 13 May 2004 18:57:55 -0000
+--- receiver.c 15 May 2004 19:31:10 -0000      1.78
++++ receiver.c 15 May 2004 20:15:15 -0000
 @@ -46,6 +46,7 @@ extern int module_id;
  extern int ignore_errors;
  extern int orig_umask;
@@ -144,7 +144,7 @@ command before "make":
  
  static void delete_one(char *fn, int is_dir)
  {
-@@ -293,7 +294,7 @@ int recv_files(int f_in,struct file_list
+@@ -294,7 +295,7 @@ int recv_files(int f_in,struct file_list
        char *fname, fbuf[MAXPATHLEN];
        char template[MAXPATHLEN];
        char fnametmp[MAXPATHLEN];
@@ -153,7 +153,7 @@ command before "make":
        char fnamecmpbuf[MAXPATHLEN];
        struct map_struct *mapbuf;
        int i;
-@@ -475,16 +476,20 @@ int recv_files(int f_in,struct file_list
+@@ -476,16 +477,20 @@ int recv_files(int f_in,struct file_list
  
                cleanup_disable();
  
@@ -179,7 +179,7 @@ command before "make":
                }
        }
 --- rsync.h    13 May 2004 18:51:22 -0000      1.203
-+++ rsync.h    13 May 2004 18:57:55 -0000
++++ rsync.h    15 May 2004 20:15:15 -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   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   13 May 2004 18:57:56 -0000
++++ rsync.yo   15 May 2004 20:15:16 -0000
 @@ -312,6 +312,7 @@ verb(
       --delete                delete files that don't exist on sender
       --delete-excluded       also delete excluded files on receiver
@@ -218,8 +218,8 @@ command before "make":
  
  dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
  even when there are I/O errors.
---- sender.c   11 May 2004 19:53:16 -0000      1.39
-+++ sender.c   13 May 2004 18:57:56 -0000
+--- sender.c   15 May 2004 19:31:10 -0000      1.40
++++ sender.c   15 May 2004 20:15:16 -0000
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int am_server;
  extern int am_daemon;
@@ -267,7 +267,7 @@ command before "make":
        while (1) {
                unsigned int offset;
  
-@@ -299,6 +324,9 @@ void send_files(struct file_list *flist,
+@@ -300,6 +325,9 @@ void send_files(struct file_list *flist,
  
                if (verbose > 2)
                        rprintf(FINFO, "sender finished %s\n", fname);