*
* Copyright (C) 1996 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
- * Copyright (C) 2003-2013 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
extern int preserve_xattrs;
extern int preserve_perms;
extern int preserve_executability;
-extern int preserve_times;
+extern int preserve_mtimes;
+extern int omit_dir_times;
+extern int omit_link_times;
extern int am_root;
extern int am_server;
extern int am_daemon;
extern int allow_8bit_chars;
extern int protocol_version;
extern int got_kill_signal;
+extern int called_from_signal_handler;
extern int inc_recurse;
extern int inplace;
extern int flist_eof;
extern int file_old_total;
extern int keep_dirlinks;
extern int make_backups;
+extern int sanitize_paths;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct chmod_mode_struct *daemon_chmod_modes;
#ifdef ICONV_OPTION
extern char *iconv_opt;
#endif
+#define UPDATED_OWNER (1<<0)
+#define UPDATED_GROUP (1<<1)
+#define UPDATED_MTIME (1<<2)
+#define UPDATED_ATIME (1<<3)
+#define UPDATED_ACLS (1<<4)
+#define UPDATED_MODE (1<<5)
+#define UPDATED_CRTIME (1<<6)
+
#ifdef ICONV_CONST
iconv_t ic_chck = (iconv_t)-1;
# ifdef ICONV_OPTION
#endif
}
-int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
- char *buf, int *len_ptr)
+int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, char *buf, int *len_ptr)
{
int len, iflags = 0;
struct file_list *flist;
}
/* Send all the data we read for this flist to the generator. */
start_flist_forward(ndx);
- flist = recv_file_list(f_in);
+ flist = recv_file_list(f_in, ndx);
flist->parent_ndx = ndx;
stop_flist_forward();
}
if (iflags & ITEM_XNAME_FOLLOWS) {
if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
exit_cleanup(RERR_PROTOCOL);
+
+ if (sanitize_paths) {
+ sanitize_path(buf, buf, "", 0, SP_DEFAULT);
+ len = strlen(buf);
+ }
} else {
*buf = '\0';
len = -1;
return new_mode;
}
+static int same_mtime(struct file_struct *file, STRUCT_STAT *st, int extra_accuracy)
+{
+#ifdef ST_MTIME_NSEC
+ uint32 f1_nsec = F_MOD_NSEC_or_0(file);
+ uint32 f2_nsec = (uint32)st->ST_MTIME_NSEC;
+#else
+ uint32 f1_nsec = 0, f2_nsec = 0;
+#endif
+
+ if (extra_accuracy) /* ignore modify_window when setting the time after a transfer or checksum check */
+ return file->modtime == st->st_mtime && f1_nsec == f2_nsec;
+
+ return same_time(file->modtime, f1_nsec, st->st_mtime , f2_nsec);
+}
+
int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
const char *fnamecmp, int flags)
{
get_acl(fname, sxp);
#endif
-#ifdef SUPPORT_XATTRS
- if (am_root < 0)
- set_stat_xattr(fname, file, new_mode);
- if (preserve_xattrs && fnamecmp)
- set_xattr(fname, file, fnamecmp, sxp);
-#endif
-
- if (!preserve_times
- || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
- || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
- flags |= ATTRS_SKIP_MTIME;
- if (!(flags & ATTRS_SKIP_MTIME)
- && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
- if (ret < 0) {
- rsyserr(FERROR_XFER, errno, "failed to set times on %s",
- full_fname(fname));
- goto cleanup;
- }
- if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
- else
- file->flags |= FLAG_TIME_FAILED;
- }
-
change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
&& sxp->st.st_gid != (gid_t)F_GROUP(file);
/* We shouldn't have attempted to change uid
* or gid unless have the privilege. */
rsyserr(FERROR_XFER, errno, "%s %s failed",
- change_uid ? "chown" : "chgrp",
- full_fname(fname));
+ change_uid ? "chown" : "chgrp",
+ full_fname(fname));
goto cleanup;
}
if (uid == (uid_t)-1 && sxp->st.st_uid != (uid_t)-1)
keep_dirlinks && S_ISDIR(sxp->st.st_mode));
}
}
- updated = 1;
+ if (change_uid)
+ updated |= UPDATED_OWNER;
+ if (change_gid)
+ updated |= UPDATED_GROUP;
+ }
+
+#ifdef SUPPORT_XATTRS
+ if (am_root < 0)
+ set_stat_xattr(fname, file, new_mode);
+ if (preserve_xattrs && fnamecmp)
+ set_xattr(fname, file, fnamecmp, sxp);
+#endif
+
+ if ((omit_dir_times && S_ISDIR(sxp->st.st_mode))
+ || (omit_link_times && S_ISLNK(sxp->st.st_mode)))
+ flags |= ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME;
+ else {
+ if (!preserve_mtimes)
+ flags |= ATTRS_SKIP_MTIME;
+ if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_ATIME;
+ /* Don't set the creation date on the root folder of an HFS+ volume. */
+ if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_CRTIME;
+ }
+ if (sxp != &sx2)
+ memcpy(&sx2.st, &sxp->st, sizeof sx2.st);
+ if (!(flags & ATTRS_SKIP_MTIME) && !same_mtime(file, &sxp->st, flags & ATTRS_ACCURATE_TIME)) {
+ sx2.st.st_mtime = file->modtime;
+#ifdef ST_MTIME_NSEC
+ sx2.st.ST_MTIME_NSEC = F_MOD_NSEC_or_0(file);
+#endif
+ updated |= UPDATED_MTIME;
+ }
+ if (!(flags & ATTRS_SKIP_ATIME)) {
+ time_t file_atime = F_ATIME(file);
+ if (flags & ATTRS_ACCURATE_TIME || !same_time(sxp->st.st_atime, 0, file_atime, 0)) {
+ sx2.st.st_atime = file_atime;
+#ifdef ST_ATIME_NSEC
+ sx2.st.ST_ATIME_NSEC = 0;
+#endif
+ updated |= UPDATED_ATIME;
+ }
+ }
+#ifdef SUPPORT_CRTIMES
+ if (crtimes_ndx && !(flags & ATTRS_SKIP_CRTIME)) {
+ time_t file_crtime = F_CRTIME(file);
+ if (sxp->crtime == 0)
+ sxp->crtime = get_create_time(fname, &sxp->st);
+ if (!same_time(sxp->crtime, 0L, file_crtime, 0L)) {
+ if (
+#ifdef HAVE_GETATTRLIST
+ do_setattrlist_crtime(fname, file_crtime) == 0
+#elif defined __CYGWIN__
+ do_SetFileTime(fname, file_crtime) == 0
+#else
+#error Unknown crtimes implementation
+#endif
+ )
+ updated |= UPDATED_CRTIME;
+ }
+ }
+#endif
+ if (updated & (UPDATED_MTIME|UPDATED_ATIME)) {
+ int ret = set_times(fname, &sx2.st);
+ if (ret < 0) {
+ rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname));
+ goto cleanup;
+ }
+ if (ret > 0) { /* ret == 1 if symlink could not be set */
+ updated &= ~(UPDATED_MTIME|UPDATED_ATIME);
+ file->flags |= FLAG_TIME_FAILED;
+ }
}
#ifdef SUPPORT_ACLS
/* It's OK to call set_acl() now, even for a dir, as the generator
* will enable owner-writability using chmod, if necessary.
- *
+ *
* If set_acl() changes permission bits in the process of setting
* an access ACL, it changes sxp->st.st_mode so we know whether we
* need to chmod(). */
if (preserve_acls && !S_ISLNK(new_mode)) {
if (set_acl(fname, file, sxp, new_mode) > 0)
- updated = 1;
+ updated |= UPDATED_ACLS;
}
#endif
goto cleanup;
}
if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
+ updated |= UPDATED_MODE;
}
#endif
}
/* This is only called for SIGINT, SIGHUP, and SIGTERM. */
-RETSIGTYPE sig_int(int sig_num)
+void sig_int(int sig_num)
{
+ called_from_signal_handler = 1;
+
/* KLUGE: if the user hits Ctrl-C while ssh is prompting
* for a password, then our cleanup's sending of a SIGUSR1
* signal to all our children may kill ssh before it has a
* we didn't already set the flag. */
if (!got_kill_signal && (am_server || am_receiver)) {
got_kill_signal = sig_num;
+ called_from_signal_handler = 0;
return;
}
* attributes (e.g. permissions, ownership, etc.). If the robust_rename()
* call is forced to copy the temp file and partialptr is both non-NULL and
* not an absolute path, we stage the file into the partial-dir and then
- * rename it into place. This returns 1 on succcess or 0 on failure. */
+ * rename it into place. This returns 1 on success or 0 on failure. */
int finish_transfer(const char *fname, const char *fnametmp,
const char *fnamecmp, const char *partialptr,
struct file_struct *file, int ok_to_set_time,
if (make_backups > 0 && overwriting_basis) {
int ok = make_backup(fname, False);
if (!ok)
- return 1;
+ exit_cleanup(RERR_FILEIO);
if (ok == 1 && fnamecmp == fname)
fnamecmp = get_backup_name(fname);
}
/* Change permissions before putting the file into place. */
set_file_attrs(fnametmp, file, NULL, fnamecmp,
- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
+ ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
do_set_file_attrs:
set_file_attrs(fnametmp, file, NULL, fnamecmp,
- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
+ ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
if (temp_copy_name) {
if (do_rename(fnametmp, fname) < 0) {
git.samba.org / rsync.git / blobdiff