#include "rsync.h"
-extern int dry_run;
extern int verbose;
extern int link_dest;
extern int make_backups;
struct file_struct *head_file = FPTR(head);
if (!log_format_has_i && verbose > 1) {
rprintf(FINFO, "\"%s\" is a hard link\n",
- safe_fname(f_name(file)));
+ f_name(file, NULL));
}
if (head_file->F_HLINDEX == FINISHED_LINK) {
STRUCT_STAT st2, st3;
- char *toname = f_name(head_file);
+ char *toname = f_name(head_file, NULL);
if (link_stat(toname, &st2, 0) < 0) {
rsyserr(FERROR, errno, "stat %s failed",
full_fname(toname));
} else
code = FERROR;
rsyserr(code, errno, "link %s => %s failed",
- full_fname(fname), safe_fname(toname));
+ full_fname(fname), toname);
return -1;
}
ITEM_LOCAL_CHANGE | ITEM_XNAME_FOLLOWS, 0,
terse ? "" : toname);
}
- if (code && verbose && !terse) {
- rprintf(code, "%s => %s\n",
- safe_fname(fname), safe_fname(toname));
- }
+ if (code && verbose && !terse)
+ rprintf(code, "%s => %s\n", fname, toname);
return 0;
}
#endif
int statret, ndx = master;
file->F_HLINDEX = FINISHED_LINK;
- if (link_stat(f_name_to(file, hlink1), &st1, 0) < 0)
+ if (link_stat(f_name(file, hlink1), &st1, 0) < 0)
return;
if (!(file->flags & FLAG_HLINK_TOL)) {
while (!(file->flags & FLAG_HLINK_EOL)) {
file = FPTR(ndx);
if (file->F_HLINDEX != SKIPPED_LINK)
continue;
- hlink2 = f_name(file);
+ hlink2 = f_name(file, NULL);
statret = link_stat(hlink2, &st2, 0);
maybe_hard_link(file, ndx, hlink2, statret, &st2,
hlink1, &st1, itemizing, code);