else
flags &= ~DEL_DIR;
- if (verbose)
+ if (verbose) {
rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
flags & DEL_DIR ? "/" : "");
+ }
if (delete_file(buf, flags) != 0) {
closedir(d);
return -1;
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
change_gid = preserve_gid && file->gid != GID_NONE
&& st->st_gid != file->gid;
-#if !HAVE_LCHOWN && !CHOWN_MODIFIES_SYMLINK
+#if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
if (S_ISLNK(st->st_mode))
;
else
if (verbose > 2) {
if (change_uid) {
rprintf(FINFO,
- "set uid of %s from %ld to %ld\n",
- fname, (long)st->st_uid, (long)file->uid);
+ "set uid of %s from %ld to %ld\n",
+ safe_fname(fname),
+ (long)st->st_uid, (long)file->uid);
}
if (change_gid) {
rprintf(FINFO,
- "set gid of %s from %ld to %ld\n",
- fname, (long)st->st_gid, (long)file->gid);
+ "set gid of %s from %ld to %ld\n",
+ safe_fname(fname),
+ (long)st->st_gid, (long)file->gid);
}
}
if (do_lchown(fname,
updated = 1;
}
-#if HAVE_CHMOD
+#ifdef HAVE_CHMOD
if (!S_ISLNK(st->st_mode)) {
if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
updated = 1;
if (verbose > 1 && flags & PERMS_REPORT) {
if (updated)
- rprintf(FINFO,"%s\n",fname);
+ rprintf(FINFO, "%s\n", safe_fname(fname));
else
- rprintf(FINFO,"%s is uptodate\n",fname);
+ rprintf(FINFO, "%s is uptodate\n", safe_fname(fname));
}
return updated;
}
if (inplace) {
if (verbose > 2)
- rprintf(FINFO, "finishing %s\n", fname);
+ rprintf(FINFO, "finishing %s\n", safe_fname(fname));
goto do_set_perms;
}
set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
/* move tmp file over real file */
- if (verbose > 2)
- rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
+ if (verbose > 2) {
+ rprintf(FINFO, "renaming %s to %s\n",
+ safe_fname(fnametmp), safe_fname(fname));
+ }
ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
- full_fname(fnametmp), fname);
+ full_fname(fnametmp), safe_fname(fname));
do_unlink(fnametmp);
return;
}