X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/638e106568145775e4be75aaf9a575da48eb7aaf..fa3e4a0548699ccaac41df2428fe1ad9d3659435:/rsync.c diff --git a/rsync.c b/rsync.c index 9062a167..68d5026e 100644 --- a/rsync.c +++ b/rsync.c @@ -31,10 +31,10 @@ extern int am_root; extern int am_server; extern int am_sender; extern int am_generator; +extern int am_starting_up; extern int preserve_uid; extern int preserve_gid; extern int inplace; -extern int recurse; extern int keep_dirlinks; extern int make_backups; extern struct stats stats; @@ -49,9 +49,8 @@ void free_sums(struct sum_struct *s) free(s); } - -int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, - int flags) +int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st, + int flags) { int updated = 0; STRUCT_STAT st2; @@ -68,17 +67,18 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, st = &st2; } - if (!preserve_times || S_ISLNK(st->st_mode) - || (S_ISDIR(st->st_mode) && omit_dir_times)) - flags |= PERMS_SKIP_MTIME; - if (!(flags & PERMS_SKIP_MTIME) + if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) + flags |= ATTRS_SKIP_MTIME; + if (!(flags & ATTRS_SKIP_MTIME) && cmp_modtime(st->st_mtime, file->modtime) != 0) { - if (set_modtime(fname,file->modtime) != 0) { + int ret = set_modtime(fname, file->modtime, st->st_mode); + if (ret < 0) { rsyserr(FERROR, errno, "failed to set times on %s", full_fname(fname)); return 0; } - updated = 1; + if (ret == 0) /* ret == 1 if symlink could not be set */ + updated = 1; } change_uid = am_root && preserve_uid && st->st_uid != file->uid; @@ -94,13 +94,13 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, if (change_uid) { rprintf(FINFO, "set uid of %s from %ld to %ld\n", - safe_fname(fname), + fname, (long)st->st_uid, (long)file->uid); } if (change_gid) { rprintf(FINFO, "set gid of %s from %ld to %ld\n", - safe_fname(fname), + fname, (long)st->st_gid, (long)file->gid); } } @@ -125,30 +125,30 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, } #ifdef HAVE_CHMOD - if (!S_ISLNK(st->st_mode)) { - if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { - updated = 1; - if (do_chmod(fname,(file->mode & CHMOD_BITS)) != 0) { - rsyserr(FERROR, errno, "failed to set permissions on %s", - full_fname(fname)); - return 0; - } + if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) { + int ret = do_chmod(fname, file->mode); + if (ret < 0) { + rsyserr(FERROR, errno, + "failed to set permissions on %s", + full_fname(fname)); + return 0; } + if (ret == 0) /* ret == 1 if symlink could not be set */ + updated = 1; } #endif - if (verbose > 1 && flags & PERMS_REPORT) { + if (verbose > 1 && flags & ATTRS_REPORT) { enum logcode code = daemon_log_format_has_i || dry_run ? FCLIENT : FINFO; if (updated) - rprintf(code, "%s\n", safe_fname(fname)); + rprintf(code, "%s\n", fname); else - rprintf(code, "%s is uptodate\n", safe_fname(fname)); + rprintf(code, "%s is uptodate\n", fname); } return updated; } - void sig_int(void) { /* KLUGE: if the user hits Ctrl-C while ssh is prompting @@ -163,36 +163,39 @@ void sig_int(void) exit_cleanup(RERR_SIGNAL); } - -/* finish off a file transfer, renaming the file and setting the permissions - and ownership */ -void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, - int ok_to_set_time, int overwriting_basis) +/* Finish off a file transfer: renaming the file and setting the file's + * attributes (e.g. permissions, ownership, etc.). If partialptr is not + * NULL and the robust_rename() call is forced to copy the temp file, we + * stage the file into the partial-dir and then rename it into place. */ +void finish_transfer(char *fname, char *fnametmp, char *partialptr, + struct file_struct *file, int ok_to_set_time, + int overwriting_basis) { int ret; if (inplace) { if (verbose > 2) - rprintf(FINFO, "finishing %s\n", safe_fname(fname)); - goto do_set_perms; + rprintf(FINFO, "finishing %s\n", fname); + fnametmp = fname; + goto do_set_file_attrs; } if (make_backups && overwriting_basis && !make_backup(fname)) return; /* Change permissions before putting the file into place. */ - set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + set_file_attrs(fnametmp, file, NULL, + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); /* move tmp file over real file */ - 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 (verbose > 2) + rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname); + ret = robust_rename(fnametmp, fname, partialptr, + file->mode & INITACCESSPERMS); if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", - ret == -2 ? "copy" : "rename", - full_fname(fnametmp), safe_fname(fname)); + ret == -2 ? "copy" : "rename", + full_fname(fnametmp), fname); do_unlink(fnametmp); return; } @@ -200,13 +203,26 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file, /* The file was moved into place (not copied), so it's done. */ return; } - do_set_perms: - set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME); + /* The file was copied, so tweak the perms of the copied file. If it + * was copied to partialptr, move it into its final destination. */ + fnametmp = partialptr ? partialptr : fname; + + do_set_file_attrs: + set_file_attrs(fnametmp, file, NULL, + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); + + if (partialptr) { + if (do_rename(fnametmp, fname) < 0) { + rsyserr(FERROR, errno, "rename %s -> \"%s\"", + full_fname(fnametmp), fname); + } else + handle_partial_dir(partialptr, PDIR_DELETE); + } } const char *who_am_i(void) { - if (am_sender < 0) + if (am_starting_up) return am_server ? "server" : "client"; return am_sender ? "sender" : am_generator ? "generator" : "receiver"; }