extern int link_dest;
extern int whole_file;
extern int local_server;
-extern int read_batch;
-extern int write_batch;
extern int list_only;
+extern int read_batch;
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
+ blength = MIN(blength, MAX_MAP_SIZE);
}
if (protocol_version < 27) {
}
}
-/**
- * Perhaps we want to just send an empty checksum set for this file,
- * which will force the whole thing to be literally transferred.
- *
- * When do we do this? If the user's explicitly said they
- * want the whole thing, or if { they haven't explicitly
- * requested a delta, and it's local but not batch mode.}
- *
- * Whew. */
-static BOOL disable_deltas_p(void)
-{
- if (whole_file > 0)
- return True;
- if (whole_file == 0 || write_batch || read_batch)
- return False;
- return local_server;
-}
-
/*
* Generate and send a stream of signatures/checksums that describe a buffer
*
* Generate approximately one checksum every block_len bytes.
*/
-static void generate_and_send_sums(struct map_struct *buf, size_t len, int f_out)
+static void generate_and_send_sums(int fd, OFF_T len, int f_out)
{
size_t i;
+ struct map_struct *mapbuf;
struct sum_struct sum;
OFF_T offset = 0;
sum_sizes_sqroot(&sum, len);
+ if (len > 0)
+ mapbuf = map_file(fd, len, sum.blength);
+ else
+ mapbuf = NULL;
+
write_sum_head(f_out, &sum);
for (i = 0; i < sum.count; i++) {
unsigned int n1 = MIN(len, sum.blength);
- char *map = map_ptr(buf, offset, n1);
+ char *map = map_ptr(mapbuf, offset, n1);
uint32 sum1 = get_checksum1(map, n1);
char sum2[SUM_LENGTH];
len -= n1;
offset += n1;
}
+
+ if (mapbuf)
+ unmap_file(mapbuf);
}
{
int fd;
STRUCT_STAT st;
- struct map_struct *mapbuf;
int statret;
char *fnamecmp;
char fnamecmpbuf[MAXPATHLEN];
return;
}
- if (statret == 0 &&
- !preserve_perms &&
- (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
+ if (statret == 0 && !preserve_perms
+ && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) {
/* if the file exists already and we aren't perserving
* permissions then act as though the remote end sent
* us the file permissions we already have */
return;
if (errno == ENOENT) {
write_int(f_out,i);
- if (!dry_run)
+ if (!dry_run && !read_batch)
write_sum_head(f_out, NULL);
} else if (verbose > 1) {
rsyserr(FERROR, errno,
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
write_int(f_out,i);
- if (!dry_run)
+ if (!dry_run && !read_batch)
write_sum_head(f_out, NULL);
return;
}
return;
}
- if (dry_run) {
+ if (dry_run || read_batch) {
write_int(f_out,i);
return;
}
- if (disable_deltas_p()) {
+ if (whole_file > 0) {
write_int(f_out,i);
write_sum_head(f_out, NULL);
return;
return;
}
- if (st.st_size > 0)
- mapbuf = map_file(fd,st.st_size);
- else
- mapbuf = NULL;
-
if (verbose > 3) {
rprintf(FINFO,"gen mapped %s of size %.0f\n", fnamecmp,
(double)st.st_size);
rprintf(FINFO, "generating and sending sums for %d\n", i);
write_int(f_out,i);
- generate_and_send_sums(mapbuf, st.st_size, f_out);
+ generate_and_send_sums(fd, st.st_size, f_out);
close(fd);
- if (mapbuf)
- unmap_file(mapbuf);
}
-void generate_files(int f, struct file_list *flist, char *local_name)
+void generate_files(int f_out, struct file_list *flist, char *local_name)
{
int i;
int phase = 0;
if (verbose >= 2) {
rprintf(FINFO,
- disable_deltas_p()
+ whole_file > 0
? "delta-transmission disabled for local transfer or --whole-file\n"
: "delta transmission enabled\n");
}
}
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f);
+ file, i, f_out);
}
phase++;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
- write_int(f,-1);
+ write_int(f_out, -1);
/* files can cycle through the system more than once
* to catch initial checksum errors */
while ((i = get_redo_num()) != -1) {
struct file_struct *file = flist->files[i];
recv_generator(local_name ? local_name : f_name_to(file, fbuf),
- file, i, f);
+ file, i, f_out);
}
phase++;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
- write_int(f,-1);
+ write_int(f_out, -1);
if (preserve_hard_links)
do_hard_links();