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;
extern unsigned int block_size;
+extern unsigned int max_map_size;
extern struct exclude_list_struct server_exclude_list;
c >>= 1;
} while (c >= 8); /* round to multiple of 8 */
blength = MAX(blength, BLOCK_SIZE);
+ blength = MIN(blength, MAX_MAP_SIZE);
}
+ max_map_size = MIN(MAX_MAP_SIZE, blength * 32);
if (protocol_version < 27) {
s2length = csum_length;
}
}
-/**
- * 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(struct map_struct *buf, OFF_T len, int f_out)
{
size_t i;
struct sum_struct sum;
return;
}
+ if (read_batch)
+ return;
+
if (preserve_links && S_ISLNK(file->mode)) {
#if SUPPORT_LINKS
char lnk[MAXPATHLEN];
return;
}
- if (disable_deltas_p()) {
+ if (whole_file > 0) {
write_int(f_out,i);
write_sum_head(f_out, NULL);
return;
}
-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();