extern int verbose;
extern int dry_run;
extern int daemon_log_format_has_i;
+extern int preserve_executability;
extern int preserve_times;
extern int omit_dir_times;
+extern int orig_umask;
extern int am_root;
extern int am_server;
extern int am_sender;
free(s);
}
+/* This is only called when we aren't preserving permissions. Figure out what
+ * the permissions should be and return them merged back into the mode. */
+mode_t dest_mode(mode_t flist_mode, mode_t dest_mode, int exists)
+{
+ /* If the file already exists we'll return the local permissions,
+ * possibly tweaked by the --executability option. */
+ if (exists) {
+ if (preserve_executability && S_ISREG(flist_mode)) {
+ /* If the source file is executable, grant execute
+ * rights to everyone who can read, but ONLY if the
+ * file isn't already executable. */
+ if (!(flist_mode & 0111))
+ dest_mode &= ~0111;
+ else if (!(dest_mode & 0111))
+ dest_mode |= (dest_mode & 0444) >> 2;
+ }
+ } else
+ dest_mode = flist_mode & ~orig_umask;
+ return (flist_mode & ~CHMOD_BITS) | (dest_mode & CHMOD_BITS);
+}
-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;
}
if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
- flags |= PERMS_SKIP_MTIME;
- if (!(flags & PERMS_SKIP_MTIME)
+ flags |= ATTRS_SKIP_MTIME;
+ if (!(flags & ATTRS_SKIP_MTIME)
&& cmp_modtime(st->st_mtime, file->modtime) != 0) {
int ret = set_modtime(fname, file->modtime, st->st_mode);
if (ret < 0) {
}
#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)
return updated;
}
-
void sig_int(void)
{
/* KLUGE: if the user hits Ctrl-C while ssh is prompting
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", fname);
- goto do_set_perms;
+ 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", fnametmp, fname);
- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+ ret = robust_rename(fnametmp, fname, partialptr,
+ file->mode & INITACCESSPERMS);
if (ret < 0) {
rsyserr(FERROR, errno, "%s %s -> \"%s\"",
ret == -2 ? "copy" : "rename",
/* 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)