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;
}
* 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;
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;
}
}
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)
rsyserr(FERROR, errno, "delete_one: unlink %s failed",
full_fname(fn));
} else if (verbose)
- rprintf(FINFO, "deleting %s\n", fn);
+ rprintf(FINFO, "deleting %s\n", safe_fname(fn));
} else {
if (do_rmdir(fn) != 0) {
if (errno == ENOTDIR && keep_dirlinks) {
"delete_one: rmdir %s failed",
full_fname(fn));
}
- } else if (verbose)
- rprintf(FINFO, "deleting directory %s\n", fn);
+ } else if (verbose) {
+ rprintf(FINFO, "deleting directory %s\n",
+ safe_fname(fn));
+ }
}
}
continue;
if (verbose > 1)
- rprintf(FINFO, "deleting in %s\n", fbuf);
+ rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
for (i = local_file_list->count-1; i >= 0; i--) {
if (max_delete && deletion_count > max_delete)
char *f = f_name(local_file_list->files[i]);
if (make_backups && (backup_dir || !is_backup_file(f))) {
make_backup(f);
- if (verbose)
- rprintf(FINFO, "deleting %s\n", f);
+ if (verbose) {
+ rprintf(FINFO, "deleting %s\n",
+ safe_fname(f));
+ }
} else {
int mode = local_file_list->files[i]->mode;
delete_one(f, S_ISDIR(mode) != 0);
mapbuf = map_file(fd_r, size_r, sum.blength);
if (verbose > 2) {
rprintf(FINFO, "recv mapped %s of size %.0f\n",
- fname_r, (double)size_r);
+ safe_fname(fname_r), (double)size_r);
}
} else
mapbuf = NULL;
fname = f_name_to(file, fbuf);
if (dry_run) {
- if (!am_server && verbose)
- rprintf(FINFO, "%s\n", fname);
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname));
continue;
}
initial_stats = stats;
if (verbose > 2)
- rprintf(FINFO,"recv_files(%s)\n",fname);
+ rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname));
fnamecmp = fname;
}
if (i < next_gen_i) {
rprintf(FINFO, "skipping update for \"%s\"\n",
- fname);
+ safe_fname(fname));
discard_receive_data(f_in, file->length);
continue;
}
if (verbose) {
rprintf(FINFO,
"skipping server-excluded update for \"%s\"\n",
- fname);
+ safe_fname(fname));
}
discard_receive_data(f_in, file->length);
continue;
cleanup_set(fnametmp, fname, file, fd1, fd2);
}
- if (!am_server && verbose)
- rprintf(FINFO, "%s\n", fname);
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname));
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
}
rprintf(msgtype,
"%s: %s failed verification -- update %sed%s.\n",
- errstr, fname, keptstr, redostr);
+ errstr, safe_fname(fname),
+ keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
char buf[4];
continue;
pathjoin(buf, sizeof buf, fname, dname);
if (verbose > 0)
- rprintf(FINFO, "deleting %s\n", buf);
+ rprintf(FINFO, "deleting %s\n", safe_fname(buf));
if (delete_file(buf) != 0) {
closedir(d);
return -1;
struct sum_struct *s;
struct map_struct *mbuf = NULL;
STRUCT_STAT st;
- char fname[MAXPATHLEN];
+ char *fname2, fname[MAXPATHLEN];
int i;
struct file_struct *file;
int phase = 0;
fname[offset++] = '/';
} else
offset = 0;
- f_name_to(file, fname + offset);
+ fname2 = f_name_to(file, fname + offset);
if (verbose > 2)
rprintf(FINFO, "send_files(%d, %s)\n", i, fname);
if (dry_run) {
- if (!am_server && verbose) {
- rprintf(FINFO, "%s\n", fname+offset);
- }
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname2));
write_int(f_out, i);
continue;
}
if (verbose > 2) {
rprintf(FINFO, "send_files mapped %s of size %.0f\n",
- fname, (double)st.st_size);
+ safe_fname(fname), (double)st.st_size);
}
write_int(f_out, i);
write_sum_head(f_out, s);
- if (verbose > 2)
- rprintf(FINFO, "calling match_sums %s\n", fname);
-
- if (!am_server && verbose) {
- rprintf(FINFO, "%s\n", fname+offset);
+ if (verbose > 2) {
+ rprintf(FINFO, "calling match_sums %s\n",
+ safe_fname(fname));
}
+ if (!am_server && verbose) /* log the transfer */
+ rprintf(FINFO, "%s\n", safe_fname(fname2));
+
set_compression(fname);
match_sums(f_out, s, mbuf, st.st_size);
free_sums(s);
- if (verbose > 2)
- rprintf(FINFO, "sender finished %s\n", fname);
+ if (verbose > 2) {
+ rprintf(FINFO, "sender finished %s\n",
+ safe_fname(fname));
+ }
}
if (verbose > 2)