Changed "count" to "used" in struct file_list since there can

[rsync/rsync.git] / generator.c

diff --git a/generator.c b/generator.c
index f6167df..c15e20f 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -7,7 +7,7 @@
  * 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,
@@ -16,8 +16,7 @@
  * 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"
@@ -42,10 +41,10 @@ extern int preserve_devices;
 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;
@@ -231,7 +230,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
        dirlist = get_dirlist(fname, dlen, 0);
        ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
 
-       if (!dirlist->count)
+       if (!dirlist->used)
                goto done;
 
        if (!(flags & DEL_RECURSE)) {
@@ -247,7 +246,7 @@ static enum delret delete_dir_contents(char *fname, int flags)
        /* We do our own recursion, so make delete_item() non-recursive. */
        flags = (flags & ~DEL_RECURSE) | DEL_DIR_IS_EMPTY;
 
-       for (j = dirlist->count; j--; ) {
+       for (j = dirlist->used; j--; ) {
                struct file_struct *fp = dirlist->files[j];
 
                if (fp->flags & FLAG_MOUNT_DIR) {
@@ -459,7 +458,7 @@ static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
 
        /* If an item in dirlist is not found in flist, delete it
         * from the filesystem. */
-       for (i = dirlist->count; i--; ) {
+       for (i = dirlist->used; i--; ) {
                struct file_struct *fp = dirlist->files[i];
                if (!F_IS_ACTIVE(fp))
                        continue;
@@ -494,7 +493,7 @@ static void do_delete_pass(void)
        if (dry_run > 1 || list_only)
                return;
 
-       for (j = 0; j < cur_flist->count; j++) {
+       for (j = 0; j < cur_flist->used; j++) {
                struct file_struct *file = cur_flist->sorted[j];
 
                if (!(file->flags & FLAG_XFER_DIR))
@@ -521,10 +520,10 @@ int unchanged_attrs(const char *fname, struct file_struct *file, statx *sxp)
        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
@@ -565,10 +564,10 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
                        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)) {
@@ -784,7 +783,7 @@ static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
        fname_len = strlen(fname);
        fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len);
 
-       for (j = 0; j < dirlist->count; j++) {
+       for (j = 0; j < dirlist->used; j++) {
                struct file_struct *fp = dirlist->files[j];
                const char *suf, *name;
                int len, suf_len;
@@ -1720,20 +1719,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 
 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;
-               end = flist->count - 1;
+               end = flist->used - 1;
        } else
                start = end = ndx;
 
        /* 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;
@@ -1744,9 +1749,9 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
                        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);
        }
 }
@@ -1861,7 +1866,7 @@ void generate_files(int f_out, const char *local_name)
        if (verbose > 2)
                rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
 
-       if (delete_before && !solo_file && cur_flist->count > 0)
+       if (delete_before && !solo_file && cur_flist->used > 0)
                do_delete_pass();
        if (delete_during == 2) {
                deldelay_size = BIGPATHBUFLEN * 4;
@@ -1942,7 +1947,7 @@ void generate_files(int f_out, const char *local_name)
 
                        if (allowed_lull && !(i % lull_mod))
                                maybe_send_keepalive();
-                       else if (!(i % 200))
+                       else if (!(i & 0xFF))
                                maybe_flush_socket(0);
                }
 
@@ -2008,7 +2013,7 @@ void generate_files(int f_out, const char *local_name)
 
        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,