Updated to apply cleanly.

[rsync/rsync-patches.git] / local-batch.diff

diff --git a/local-batch.diff b/local-batch.diff
index c1b10b3..b7b1d1d 100644 (file)
--- a/local-batch.diff
+++ b/local-batch.diff
@@ -1,5 +1,5 @@
 --- batch.c    15 May 2004 19:31:10 -0000      1.32
-+++ batch.c    18 Jun 2004 17:16:35 -0000
++++ batch.c    30 Jun 2004 00:10:16 -0000
 @@ -172,6 +172,7 @@ void close_batch_csums_file(void)
  
  /**
@@ -29,7 +29,7 @@
                rsyserr(FERROR, errno, "Batch file %s write error", filename);
                close(f_delta);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
-+++ flist.c    18 Jun 2004 17:16:35 -0000
++++ flist.c    30 Jun 2004 00:10:16 -0000
 @@ -950,7 +950,7 @@ void send_file_name(int f, struct file_l
  
        flist_expand(flist);
@@ -58,8 +58,8 @@
        }
  
        if (verbose > 3)
---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:16:35 -0000
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:10:16 -0000
 @@ -48,6 +48,7 @@ extern int whole_file;
  extern int local_server;
  extern int read_batch;
@@ -68,7 +68,7 @@
  extern int list_only;
  extern int only_existing;
  extern int orig_umask;
-@@ -227,16 +228,27 @@ static BOOL disable_deltas_p(void)
+@@ -224,16 +225,27 @@ static BOOL disable_deltas_p(void)
   * Generate and send a stream of signatures/checksums that describe a buffer
   *
   * Generate approximately one checksum every block_len bytes.
@@ -98,7 +98,7 @@
  
        for (i = 0; i < sum.count; i++) {
                unsigned int n1 = MIN(len, sum.blength);
-@@ -256,10 +268,30 @@ static void generate_and_send_sums(struc
+@@ -253,10 +265,30 @@ static void generate_and_send_sums(struc
                write_buf(f_out, sum2, sum.s2length);
                len -= n1;
                offset += n1;
@@ -127,9 +127,9 @@
 +              write_batch_csum_info(&i, NULL);
 +}
  
- /**
+ /*
   * Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -454,9 +486,7 @@ void recv_generator(char *fname, struct 
+@@ -452,9 +484,7 @@ static void recv_generator(char *fname, 
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
                if (errno == ENOENT) {
@@ -140,7 +140,7 @@
                } else if (verbose > 1) {
                        rsyserr(FERROR, errno,
                                "recv_generator: failed to open %s",
-@@ -473,9 +503,7 @@ void recv_generator(char *fname, struct 
+@@ -471,9 +501,7 @@ static void recv_generator(char *fname, 
                /* now pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
@@ -151,7 +151,7 @@
                return;
        }
  
-@@ -503,8 +531,7 @@ void recv_generator(char *fname, struct 
+@@ -502,8 +530,7 @@ static void recv_generator(char *fname, 
        }
  
        if (disable_deltas_p()) {
@@ -161,7 +161,7 @@
                return;
        }
  
-@@ -517,8 +544,7 @@ void recv_generator(char *fname, struct 
+@@ -516,8 +543,7 @@ static void recv_generator(char *fname, 
                /* pretend the file didn't exist */
                if (preserve_hard_links && hard_link_check(file, HL_SKIP))
                        return;
@@ -171,7 +171,7 @@
                return;
        }
  
-@@ -536,7 +562,7 @@ void recv_generator(char *fname, struct 
+@@ -535,7 +561,7 @@ static void recv_generator(char *fname, 
                rprintf(FINFO, "generating and sending sums for %d\n", i);
  
        write_int(f_out,i);
@@ -180,9 +180,9 @@
  
        close(fd);
        if (mapbuf)
---- main.c     18 Jun 2004 16:50:20 -0000      1.198
-+++ main.c     18 Jun 2004 17:16:36 -0000
-@@ -1029,6 +1029,10 @@ int main(int argc,char *argv[])
+--- main.c     28 Jun 2004 17:45:40 -0000      1.201
++++ main.c     30 Jun 2004 00:10:16 -0000
+@@ -1039,6 +1039,10 @@ int main(int argc,char *argv[])
  
        if (write_batch && !am_server) {
                write_batch_argvs_file(orig_argc, orig_argv);
@@ -193,8 +193,8 @@
        }
  
        if (am_daemon && !am_server)
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:16:36 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:10:17 -0000
 @@ -643,6 +643,15 @@ int parse_arguments(int *argc, const cha
                        "write-batch and read-batch can not be used together\n");
                exit_cleanup(RERR_SYNTAX);
@@ -226,7 +226,7 @@
                if (asprintf(&arg, "--timeout=%d", io_timeout) < 0)
                        goto oom;
 --- pipe.c     18 Jun 2004 16:00:33 -0000      1.8
-+++ pipe.c     18 Jun 2004 17:16:36 -0000
++++ pipe.c     30 Jun 2004 00:10:17 -0000
 @@ -26,6 +26,7 @@ extern int am_server;
  extern int blocking_io;
  extern int orig_umask;
@@ -249,8 +249,8 @@
                if (!am_sender)
                        filesfrom_fd = -1;
  
---- receiver.c 14 Jun 2004 15:09:36 -0000      1.82
-+++ receiver.c 18 Jun 2004 17:16:36 -0000
+--- receiver.c 29 Jun 2004 15:12:01 -0000      1.83
++++ receiver.c 30 Jun 2004 00:10:17 -0000
 @@ -46,6 +46,7 @@ extern int cleanup_got_literal;
  extern int module_id;
  extern int ignore_errors;
@@ -279,7 +279,7 @@
                        rprintf(FERROR,"Invalid file index %d in recv_files (count=%d)\n",
                                i, flist->count);
 --- token.c    18 Jun 2004 16:22:14 -0000      1.31
-+++ token.c    18 Jun 2004 17:16:36 -0000
++++ token.c    30 Jun 2004 00:10:17 -0000
 @@ -80,6 +80,8 @@ static int simple_recv_token(int f,char 
  
        if (residue == 0) {