Split up the ifuncs.h file into 3 .h files.

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index 2ba1ab9..3afc40f 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -20,6 +20,7 @@
  */
 
 #include "rsync.h"
+#include "inums.h"
 
 extern int dry_run;
 extern int do_xfers;
@@ -44,6 +45,7 @@ extern int remove_source_files;
 extern int append_mode;
 extern int sparse_files;
 extern int keep_partial;
+extern int checksum_len;
 extern int checksum_seed;
 extern int inplace;
 extern int delay_updates;
@@ -51,7 +53,8 @@ extern mode_t orig_umask;
 extern struct stats stats;
 extern char *tmpdir;
 extern char *partial_dir;
-extern char *basis_dir[];
+extern char *basis_dir[MAX_BASIS_DIRS+1];
+extern char sender_file_sum[MAX_DIGEST_LEN];
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct filter_list_struct daemon_filter_list;
 
@@ -163,10 +166,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                        const char *fname, int fd, OFF_T total_size)
 {
        static char file_sum1[MAX_DIGEST_LEN];
-       static char file_sum2[MAX_DIGEST_LEN];
        struct map_struct *mapbuf;
        struct sum_struct sum;
-       int32 len, sum_len;
+       int32 len;
        OFF_T offset = 0;
        OFF_T offset2;
        char *data;
@@ -178,9 +180,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
        if (fd_r >= 0 && size_r > 0) {
                int32 read_size = MAX(sum.blength * 2, 16*1024);
                mapbuf = map_file(fd_r, size_r, read_size, sum.blength);
-               if (DEBUG_GTE(CHKSUM, 2)) {
-                       rprintf(FINFO, "recv mapped %s of size %.0f\n",
-                               fname_r, (double)size_r);
+               if (DEBUG_GTE(DELTASUM, 2)) {
+                       rprintf(FINFO, "recv mapped %s of size %s\n",
+                               fname_r, big_num(size_r));
                }
        } else
                mapbuf = NULL;
@@ -209,8 +211,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                }
                offset = sum.flength;
                if (fd != -1 && (j = do_lseek(fd, offset, SEEK_SET)) != offset) {
-                       rsyserr(FERROR_XFER, errno, "lseek of %s returned %.0f, not %.0f",
-                               full_fname(fname), (double)j, (double)offset);
+                       rsyserr(FERROR_XFER, errno, "lseek of %s returned %s, not %s",
+                               full_fname(fname), big_num(j), big_num(offset));
                        exit_cleanup(RERR_FILEIO);
                }
        }
@@ -220,9 +222,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                        show_progress(offset, total_size);
 
                if (i > 0) {
-                       if (DEBUG_GTE(CHKSUM, 3)) {
-                               rprintf(FINFO,"data recv %d at %.0f\n",
-                                       i,(double)offset);
+                       if (DEBUG_GTE(DELTASUM, 3)) {
+                               rprintf(FINFO,"data recv %d at %s\n",
+                                       i, big_num(offset));
                        }
 
                        stats.literal_data += i;
@@ -244,10 +246,10 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 
                stats.matched_data += len;
 
-               if (DEBUG_GTE(CHKSUM, 3)) {
+               if (DEBUG_GTE(DELTASUM, 3)) {
                        rprintf(FINFO,
-                               "chunk[%d] of size %ld at %.0f offset=%.0f\n",
-                               i, (long)len, (double)offset2, (double)offset);
+                               "chunk[%d] of size %ld at %s offset=%s\n",
+                               i, (long)len, big_num(offset2), big_num(offset));
                }
 
                if (mapbuf) {
@@ -265,9 +267,9 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                                offset += len;
                                if ((pos = do_lseek(fd, len, SEEK_CUR)) != offset) {
                                        rsyserr(FERROR_XFER, errno,
-                                               "lseek of %s returned %.0f, not %.0f",
+                                               "lseek of %s returned %s, not %s",
                                                full_fname(fname),
-                                               (double)pos, (double)offset);
+                                               big_num(pos), big_num(offset));
                                        exit_cleanup(RERR_FILEIO);
                                }
                                continue;
@@ -296,15 +298,16 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
                exit_cleanup(RERR_FILEIO);
        }
 
-       sum_len = sum_end(file_sum1);
+       if (sum_end(file_sum1) != checksum_len)
+               overflow_exit("checksum_len"); /* Impossible... */
 
        if (mapbuf)
                unmap_file(mapbuf);
 
-       read_buf(f_in, file_sum2, sum_len);
-       if (DEBUG_GTE(CHKSUM, 2))
+       read_buf(f_in, sender_file_sum, checksum_len);
+       if (DEBUG_GTE(DELTASUM, 2))
                rprintf(FINFO,"got file_sum\n");
-       if (fd != -1 && memcmp(file_sum1, file_sum2, sum_len) != 0)
+       if (fd != -1 && memcmp(file_sum1, sender_file_sum, checksum_len) != 0)
                return 0;
        return 1;
 }
@@ -700,23 +703,30 @@ int recv_files(int f_in, char *local_name)
                                do_unlink(partialptr);
                                handle_partial_dir(partialptr, PDIR_DELETE);
                        }
-               } else if (keep_partial && partialptr
-                   && handle_partial_dir(partialptr, PDIR_CREATE)) {
-                       if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
-                                            file, recv_ok, !partial_dir))
+               } else if (keep_partial && partialptr) {
+                       if (!handle_partial_dir(partialptr, PDIR_CREATE)) {
+                               rprintf(FERROR,
+                                   "Unable to create partial-dir for %s -- discarding %s.\n",
+                                   local_name ? local_name : f_name(file, NULL),
+                                   recv_ok ? "completed file" : "partial file");
+                               do_unlink(fnametmp);
+                               recv_ok = -1;
+                       } else if (!finish_transfer(partialptr, fnametmp, fnamecmp, NULL,
+                                                   file, recv_ok, !partial_dir))
                                recv_ok = -1;
                        else if (delay_updates && recv_ok) {
                                bitbag_set_bit(delayed_bits, ndx);
                                recv_ok = 2;
-                       }
-               } else {
-                       partialptr = NULL;
+                       } else
+                               partialptr = NULL;
+               } else
                        do_unlink(fnametmp);
-               }
 
                cleanup_disable();
 
                switch (recv_ok) {
+               case 2:
+                       break;
                case 1:
                        if (remove_source_files || inc_recurse
                         || (preserve_hard_links && F_IS_HLINKED(file)))