* Copyright (C) 2003-2007 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
+ * it under the terms of the GNU General Public License version 3 as
* published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
*/
#include "rsync.h"
extern int preserve_specials;
extern int preserve_hard_links;
extern int preserve_perms;
-extern int preserve_uid;
-extern int preserve_gid;
extern int preserve_times;
extern int omit_dir_times;
+extern int uid_ndx;
+extern int gid_ndx;
extern int delete_mode;
extern int delete_before;
extern int delete_during;
if (preserve_perms && !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
return 0;
- if (am_root && preserve_uid && sxp->st.st_uid != F_UID(file))
+ if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file))
return 0;
- if (preserve_gid && F_GID(file) != GID_NONE && sxp->st.st_gid != F_GID(file))
+ if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
return 0;
#ifdef SUPPORT_ACLS
iflags |= ITEM_REPORT_TIME;
if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
+ if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
- if (preserve_gid && F_GID(file) != GID_NONE
- && sxp->st.st_gid != F_GID(file))
+ if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
+ && sxp->st.st_gid != (gid_t)F_GROUP(file))
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
static void touch_up_dirs(struct file_list *flist, int ndx)
{
+ static int counter = 0;
struct file_struct *file;
char *fname;
- int i, j, start, end;
+ int i, start, end;
if (ndx < 0) {
start = 0;
/* Fix any directory permissions that were modified during the
* transfer and/or re-set any tweaked modified-time values. */
- for (i = start, j = 0; i <= end; i++) {
- file = flist->sorted[i];
+ for (i = start; i <= end; i++, counter++) {
+ file = flist->files[i];
+ if (verbose > 3) {
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
+ NS(fname), i);
+ }
if (!F_IS_ACTIVE(file) || !S_ISDIR(file->mode)
|| file->flags & FLAG_MISSING_DIR)
continue;
do_chmod(fname, file->mode);
if (need_retouch_dir_times)
set_modtime(fname, file->modtime, file->mode);
- if (allowed_lull && !(++j % lull_mod))
+ if (allowed_lull && !(counter % lull_mod))
maybe_send_keepalive();
- else if (!(j % 200))
+ else if (!(counter & 0xFF))
maybe_flush_socket(0);
}
}
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
- else if (!(i % 200))
+ else if (!(i & 0xFF))
maybe_flush_socket(0);
}
if ((need_retouch_dir_perms || need_retouch_dir_times)
&& dir_tweaking && (!inc_recurse || delete_during == 2))
- touch_up_dirs(inc_recurse ? dir_flist : cur_flist, -1);
+ touch_up_dirs(dir_flist, -1);
if (max_delete >= 0 && deletion_count > max_delete) {
rprintf(FINFO,