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;
extern char *tmpdir;
extern char *partial_dir;
extern char *basis_dir[];
+extern char sender_file_sum[];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;
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;
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);
+ rprintf(FINFO, "recv mapped %s of size %s\n",
+ fname_r, big_num(size_r, 0));
}
} else
mapbuf = NULL;
}
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, 0), big_num(offset, 0));
exit_cleanup(RERR_FILEIO);
}
}
if (i > 0) {
if (DEBUG_GTE(CHKSUM, 3)) {
- rprintf(FINFO,"data recv %d at %.0f\n",
- i,(double)offset);
+ rprintf(FINFO,"data recv %d at %s\n",
+ i, big_num(offset, 0));
}
stats.literal_data += i;
if (DEBUG_GTE(CHKSUM, 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, 0), big_num(offset, 0));
}
if (mapbuf) {
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, 0), big_num(offset, 0));
exit_cleanup(RERR_FILEIO);
}
continue;
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);
+ read_buf(f_in, sender_file_sum, checksum_len);
if (DEBUG_GTE(CHKSUM, 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;
}