My modified version of Chris Shoemaker's improved batch-file handling.

[rsync/rsync.git] / sender.c

diff --git a/sender.c b/sender.c
index 3c14ddf..9fe5f62 100644 (file)
--- a/sender.c
+++ b/sender.c
@@ -118,13 +118,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        int phase = 0;
        extern struct stats stats;
        struct stats initial_stats;
-       extern int write_batch;
-       extern int read_batch;
-       int checksums_match;
-       int buff_len;
-       char buff[CHUNK_SIZE];
        int j;
-       int done;
 
        if (verbose > 2)
                rprintf(FINFO, "send_files starting\n");
@@ -186,54 +180,45 @@ void send_files(struct file_list *flist, int f_out, int f_in)
                        return;
                }
 
-               if (write_batch)
-                       write_batch_csum_info(&i, s);
-
-               if (!read_batch) {
-                       fd = do_open(fname, O_RDONLY, 0);
-                       if (fd == -1) {
-                               if (errno == ENOENT) {
-                                       enum logcode c = am_daemon
-                                           && protocol_version < 28 ? FERROR
-                                                                    : FINFO;
-                                       io_error |= IOERR_VANISHED;
-                                       rprintf(c, "file has vanished: %s\n",
-                                               full_fname(fname));
-                               } else {
-                                       io_error |= IOERR_GENERAL;
-                                       rsyserr(FERROR, errno,
-                                               "send_files failed to open %s",
-                                               full_fname(fname));
-                               }
-                               free_sums(s);
-                               continue;
-                       }
-
-                       /* map the local file */
-                       if (do_fstat(fd, &st) != 0) {
+               fd = do_open(fname, O_RDONLY, 0);
+               if (fd == -1) {
+                       if (errno == ENOENT) {
+                               enum logcode c = am_daemon
+                                   && protocol_version < 28 ? FERROR
+                                                            : FINFO;
+                               io_error |= IOERR_VANISHED;
+                               rprintf(c, "file has vanished: %s\n",
+                                       full_fname(fname));
+                       } else {
                                io_error |= IOERR_GENERAL;
-                               rsyserr(FERROR, errno, "fstat failed");
-                               free_sums(s);
-                               close(fd);
-                               return;
-                       }
-
-                       mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
-
-                       if (verbose > 2) {
-                               rprintf(FINFO, "send_files mapped %s of size %.0f\n",
-                                       fname, (double)st.st_size);
+                               rsyserr(FERROR, errno,
+                                       "send_files failed to open %s",
+                                       full_fname(fname));
                        }
+                       free_sums(s);
+                       continue;
+               }
 
-                       write_int(f_out, i);
+               /* map the local file */
+               if (do_fstat(fd, &st) != 0) {
+                       io_error |= IOERR_GENERAL;
+                       rsyserr(FERROR, errno, "fstat failed");
+                       free_sums(s);
+                       close(fd);
+                       return;
+               }
 
-                       if (write_batch)
-                               write_batch_delta_file((char *)&i, sizeof i);
+               mbuf = st.st_size ? map_file(fd, st.st_size) : NULL;
 
-                       write_sum_head(f_out, s);
+               if (verbose > 2) {
+                       rprintf(FINFO, "send_files mapped %s of size %.0f\n",
+                               fname, (double)st.st_size);
                }
 
-               if (verbose > 2 && !read_batch)
+               write_int(f_out, i);
+               write_sum_head(f_out, s);
+
+               if (verbose > 2)
                        rprintf(FINFO, "calling match_sums %s\n", fname);
 
                if (!am_server && verbose) {
@@ -242,59 +227,19 @@ void send_files(struct file_list *flist, int f_out, int f_in)
 
                set_compression(fname);
 
-               if (read_batch) {
-                       /* read checksums originally computed on sender side */
-                       read_batch_csum_info(i, s, &checksums_match);
-                       if (checksums_match) {
-                               read_batch_delta_file((char*)&j, sizeof (int));
-                               if (j != i) {    /* if flist index entries don't match*/
-                                       rprintf(FINFO, "index mismatch in send_files\n");
-                                       rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
-                                       close_batch_delta_file();
-                                       close_batch_csums_file();
-                                       exit_cleanup(1);
-                               } else {
-                                       write_int(f_out, j);
-                                       write_sum_head(f_out, s);
-                                       done = 0;
-                                       while (!done) {
-                                               read_batch_delta_file((char*)&buff_len, sizeof (int));
-                                               write_int(f_out, buff_len);
-                                               if (buff_len == 0) {
-                                                       done = 1;
-                                               } else {
-                                                       if (buff_len > 0) {
-                                                               read_batch_delta_file(buff, buff_len);
-                                                               write_buf(f_out, buff, buff_len);
-                                                       }
-                                               }
-                                       }
-                                       read_batch_delta_file(buff, MD4_SUM_LENGTH);
-                                       write_buf(f_out, buff, MD4_SUM_LENGTH);
-
-                               }
-                       } else {  /* not checksum match */
-                               rprintf (FINFO, "readbatch & checksums don't match\n");
-                               rprintf (FINFO, "filename=%s is being skipped\n", fname);
-                               continue;
-                       }
-               } else  { /* not read_batch */
-                       match_sums(f_out, s, mbuf, st.st_size);
-                       log_send(file, &initial_stats);
-               }
+               match_sums(f_out, s, mbuf, st.st_size);
+               log_send(file, &initial_stats);
 
-               if (!read_batch) {
-                       if (mbuf) {
-                               j = unmap_file(mbuf);
-                               if (j) {
-                                       io_error |= IOERR_GENERAL;
-                                       rsyserr(FERROR, j,
-                                               "read errors mapping %s",
-                                               full_fname(fname));
-                               }
+               if (mbuf) {
+                       j = unmap_file(mbuf);
+                       if (j) {
+                               io_error |= IOERR_GENERAL;
+                               rsyserr(FERROR, j,
+                                       "read errors mapping %s",
+                                       full_fname(fname));
                        }
-                       close(fd);
                }
+               close(fd);
 
                free_sums(s);
 
@@ -308,14 +253,4 @@ void send_files(struct file_list *flist, int f_out, int f_in)
        match_report();
 
        write_int(f_out, -1);
-       if (write_batch || read_batch) {
-               close_batch_csums_file();
-               close_batch_delta_file();
-       }
-
 }
-
-
-
-
-