extern int dry_run;
extern int preserve_times;
extern int am_root;
+extern int am_server;
+extern int am_sender;
+extern int am_generator;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_perms;
if (strcmp(dname,".") == 0
|| strcmp(dname,"..") == 0)
continue;
- snprintf(buf, sizeof(buf), "%s/%s", fname, dname);
+ pathjoin(buf, sizeof buf, fname, dname);
if (verbose > 0)
rprintf(FINFO,"deleting %s\n", buf);
if (delete_file(buf) != 0) {
if (preserve_times && !S_ISLNK(st->st_mode) &&
cmp_modtime(st->st_mtime, file->modtime) != 0) {
/* don't complain about not setting times on directories
- because some filesystems can't do it */
+ * because some filesystems can't do it */
if (set_modtime(fname,file->modtime) != 0 &&
!S_ISDIR(st->st_mode)) {
rprintf(FERROR, "failed to set times on %s: %s\n",
full_fname(fname), strerror(errno));
return 0;
- } else {
- updated = 1;
}
+ updated = 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 (change_uid || change_gid) {
+ 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);
+ }
+ if (change_gid) {
+ rprintf(FINFO,
+ "set gid of %s from %ld to %ld\n",
+ fname, (long)st->st_gid, (long)file->gid);
+ }
+ }
if (do_lchown(fname,
- change_uid?file->uid:st->st_uid,
- change_gid?file->gid:st->st_gid) != 0) {
+ change_uid ? file->uid : st->st_uid,
+ change_gid ? file->gid : st->st_gid) != 0) {
/* shouldn't have attempted to change uid or gid
- unless have the privilege */
- rprintf(FERROR, "chown %s failed: %s\n",
- full_fname(fname), strerror(errno));
+ * unless have the privilege */
+ rprintf(FERROR, "%s %s failed: %s\n",
+ change_uid ? "chown" : "chgrp",
+ full_fname(fname), strerror(errno));
return 0;
}
/* a lchown had been done - we have to re-stat if the
- destination had the setuid or setgid bits set due
- to the side effect of the chown call */
+ * destination had the setuid or setgid bits set due
+ * to the side effect of the chown call */
if (st->st_mode & (S_ISUID | S_ISGID)) {
link_stat(fname, st);
}
and ownership */
void finish_transfer(char *fname, char *fnametmp, struct file_struct *file)
{
+ int ret;
+
if (make_backups && !make_backup(fname))
return;
/* move tmp file over real file */
- if (robust_rename(fnametmp,fname) != 0) {
- if (errno == EXDEV) {
- /* rename failed on cross-filesystem link.
- Copy the file instead. */
- if (copy_file(fnametmp,fname, file->mode & INITACCESSPERMS)) {
- rprintf(FERROR, "copy %s -> \"%s\": %s\n",
- full_fname(fnametmp), fname,
- strerror(errno));
- } else {
- set_perms(fname,file,NULL,0);
- }
- } else {
- rprintf(FERROR,"rename %s -> \"%s\": %s\n",
- full_fname(fnametmp), fname, strerror(errno));
- }
+ ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+ if (ret != 0) {
+ rprintf(FERROR, "%s %s -> \"%s\": %s\n",
+ ret == -2 ? "copy" : "rename",
+ full_fname(fnametmp), fname, strerror(errno));
do_unlink(fnametmp);
} else {
set_perms(fname,file,NULL,0);
}
}
+
+const char *who_am_i(void)
+{
+ return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+}