*/
#include "rsync.h"
+#include "inums.h"
extern int dry_run;
extern int do_xfers;
extern struct stats stats;
extern char *tmpdir;
extern char *partial_dir;
-extern char *basis_dir[];
-extern char sender_file_sum[];
+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;
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)) {
+ if (DEBUG_GTE(DELTASUM, 2)) {
rprintf(FINFO, "recv mapped %s of size %s\n",
- fname_r, big_num(size_r, 0));
+ fname_r, big_num(size_r));
}
} 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 %s, not %s",
- full_fname(fname), big_num(j, 0), big_num(offset, 0));
+ full_fname(fname), big_num(j), big_num(offset));
exit_cleanup(RERR_FILEIO);
}
}
show_progress(offset, total_size);
if (i > 0) {
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,"data recv %d at %s\n",
- i, big_num(offset, 0));
+ i, big_num(offset));
}
stats.literal_data += i;
stats.matched_data += len;
- if (DEBUG_GTE(CHKSUM, 3)) {
+ if (DEBUG_GTE(DELTASUM, 3)) {
rprintf(FINFO,
"chunk[%d] of size %ld at %s offset=%s\n",
- i, (long)len, big_num(offset2, 0), big_num(offset, 0));
+ i, (long)len, big_num(offset2), big_num(offset));
}
if (mapbuf) {
rsyserr(FERROR_XFER, errno,
"lseek of %s returned %s, not %s",
full_fname(fname),
- big_num(pos, 0), big_num(offset, 0));
+ big_num(pos), big_num(offset));
exit_cleanup(RERR_FILEIO);
}
continue;
unmap_file(mapbuf);
read_buf(f_in, sender_file_sum, checksum_len);
- if (DEBUG_GTE(CHKSUM, 2))
+ if (DEBUG_GTE(DELTASUM, 2))
rprintf(FINFO,"got file_sum\n");
if (fd != -1 && memcmp(file_sum1, sender_file_sum, checksum_len) != 0)
return 0;
static int get_next_gen_ndx(int fd, int next_gen_ndx, int desired_ndx)
{
+ static int batch_eof = 0;
+
while (next_gen_ndx < desired_ndx) {
if (next_gen_ndx >= 0) {
struct file_struct *file = cur_flist->files[next_gen_ndx];
file->flags & FLAG_FILE_SENT ? " resend of" : "",
f_name(file, NULL));
}
- next_gen_ndx = read_int(fd);
+ next_gen_ndx = batch_eof ? -1 : read_int(fd);
if (next_gen_ndx == -1) {
if (inc_recurse)
next_gen_ndx = first_flist->prev->used + first_flist->prev->ndx_start;
else
next_gen_ndx = cur_flist->used;
+ batch_eof = 1;
}
}
+
return next_gen_ndx;
}
"(Skipping batched update for \"%s\")\n",
fname);
discard_receive_data(f_in, F_LENGTH(file));
- if (inc_recurse)
- send_msg_int(MSG_NO_SEND, ndx);
continue;
}
next_gen_ndx = -1;
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)))