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 (verbose > 2)
- rprintf(FINFO,"recv_generator(%s,%d)\n",fname,i);
+ rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i);
if (server_exclude_list.head
&& check_exclude(&server_exclude_list, fname,
S_ISDIR(file->mode)) < 0) {
if (verbose) {
rprintf(FINFO, "skipping server-excluded file \"%s\"\n",
- fname);
+ safe_fname(fname));
}
return;
}
if (only_existing && statret == -1 && errno == ENOENT) {
/* we only want to update existing files */
- if (verbose > 1)
- rprintf(FINFO, "not creating new file \"%s\"\n", fname);
+ if (verbose > 1) {
+ rprintf(FINFO, "not creating new file \"%s\"\n",
+ safe_fname(fname));
+ }
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 */
* and modification-time repair. */
if (set_perms(fname, file, statret ? NULL : &st, 0)
&& verbose && f_out != -1)
- rprintf(FINFO,"%s/\n",fname);
+ rprintf(FINFO, "%s/\n", safe_fname(fname));
return;
}
}
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
- full_fname(fname), file->u.link);
+ full_fname(fname), safe_fname(file->u.link));
} else {
set_perms(fname,file,NULL,0);
if (verbose) {
- rprintf(FINFO,"%s -> %s\n", fname,file->u.link);
+ rprintf(FINFO, "%s -> %s\n", safe_fname(fname),
+ safe_fname(file->u.link));
}
}
#endif
delete_file(fname);
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
- fname,(int)file->mode,(int)file->u.rdev);
+ safe_fname(fname),
+ (int)file->mode, (int)file->u.rdev);
}
if (do_mknod(fname,file->mode,file->u.rdev) != 0) {
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
set_perms(fname,file,NULL,0);
- if (verbose)
- rprintf(FINFO,"%s\n",fname);
+ if (verbose) {
+ rprintf(FINFO, "%s\n",
+ safe_fname(fname));
+ }
}
} else {
set_perms(fname, file, &st, PERMS_REPORT);
return;
if (!S_ISREG(file->mode)) {
- rprintf(FINFO, "skipping non-regular file \"%s\"\n",fname);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n",
+ safe_fname(fname));
return;
}
if (do_link(fnamecmpbuf, fname) != 0) {
if (verbose > 0) {
rsyserr(FINFO, errno, "link %s => %s",
- fnamecmpbuf, fname);
+ fnamecmpbuf, safe_fname(fname));
}
}
fnamecmp = fnamecmpbuf;
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;
}
if (opt_ignore_existing && fnamecmp == fname) {
if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
+ rprintf(FINFO, "%s exists\n", safe_fname(fname));
return;
}
if (update_only && fnamecmp == fname
&& cmp_modtime(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO,"%s is newer\n",fname);
+ rprintf(FINFO, "%s is newer\n", safe_fname(fname));
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, "gen mapped %s of size %.0f\n",
+ safe_fname(fnamecmp), (double)st.st_size);
}
if (verbose > 2)
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);
}
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");
}