* and transmits them to the receiver. The sender process runs on the
* machine holding the source files.
**/
-
-
void read_sum_head(int f, struct sum_struct *sum)
{
extern int protocol_version;
s->sums = NULL;
- if (verbose > 3)
- rprintf(FINFO, "count=%ld n=%ld rem=%ld\n",
- (long) s->count, (long) s->blength,
- (long) s->remainder);
+ if (verbose > 3) {
+ rprintf(FINFO, "count=%ld n=%u rem=%u\n",
+ (long)s->count, s->blength, s->remainder);
+ }
if (s->count == 0)
return(s);
file = flist->files[i];
+ stats.current_file_index = i;
stats.num_transferred_files++;
stats.total_transferred_size += file->length;
strlcat(fname, "/", MAXPATHLEN);
offset = strlen(file->basedir)+1;
}
- strlcat(fname, f_name(file), MAXPATHLEN);
+ f_name_to(file, fname + offset, MAXPATHLEN - offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
}
if (write_batch)
- write_batch_csum_info(&i, flist->count, s);
+ write_batch_csum_info(&i, s);
if (!read_batch) {
fd = do_open(fname, O_RDONLY, 0);
/* read checksums originally computed on sender side */
read_batch_csum_info(i, s, &checksums_match);
if (checksums_match) {
- read_batch_delta_file( (char *) &j, sizeof(int) );
+ read_batch_delta_file((char*)&j, sizeof (int));
if (j != i) { /* if flist index entries don't match*/
rprintf(FINFO, "index mismatch in send_files\n");
rprintf(FINFO, "read index = %d flist ndx = %d\n", j, i);
write_sum_head(f_out, s);
done = 0;
while (!done) {
- read_batch_delta_file( (char *) &buff_len, sizeof(int) );
+ read_batch_delta_file((char*)&buff_len, sizeof (int));
write_int(f_out, buff_len);
if (buff_len == 0) {
done = 1;