X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/da38e779eaec59640aeec468ea94a0610a9fa200..0abda1b176b0cb95f5a177d5206ddbada9f74787:/rsync.c diff --git a/rsync.c b/rsync.c index 125369bc..472e1ef2 100644 --- a/rsync.c +++ b/rsync.c @@ -34,6 +34,7 @@ extern int force_delete; extern int recurse; extern int make_backups; extern char *backup_dir; +extern int inplace; /* @@ -239,6 +240,12 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, if (make_backups && !make_backup(fname)) return; + if (inplace) { + if (verbose > 2) + rprintf(FINFO, "finishing %s\n", fname); + goto do_set_perms; + } + /* move tmp file over real file */ if (verbose > 2) rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); @@ -248,10 +255,10 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, ret == -2 ? "copy" : "rename", full_fname(fnametmp), fname); do_unlink(fnametmp); - } else { - set_perms(fname, file, NULL, - ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + return; } + do_set_perms: + set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); } const char *who_am_i(void)