Assign the owner and group using F_OWNER() and F_GROUP().

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 2858b35..9273cfd 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -755,9 +755,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        }
        file->mode = mode;
        if (preserve_uid)
-               F_UID(file) = uid;
+               F_OWNER(file) = uid;
        if (preserve_gid)
-               F_GID(file) = gid;
+               F_GROUP(file) = gid;
 
        if (basename != thisname) {
                file->dirname = lastdir;
@@ -1052,9 +1052,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
        }
        file->mode = st.st_mode;
        if (preserve_uid)
-               F_UID(file) = st.st_uid;
+               F_OWNER(file) = st.st_uid;
        if (preserve_gid)
-               F_GID(file) = st.st_gid;
+               F_GROUP(file) = st.st_gid;
 
        if (basename != thisname)
                file->dirname = lastdir;
@@ -1083,9 +1083,9 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
                        file->len32 = 0;
                        file->mode = st2.st_mode;
                        if (preserve_uid)
-                               F_UID(file) = st2.st_uid;
+                               F_OWNER(file) = st2.st_uid;
                        if (preserve_gid)
-                               F_GID(file) = st2.st_gid;
+                               F_GROUP(file) = st2.st_gid;
                } else
                        file->mode = save_mode;
        }
@@ -1286,7 +1286,6 @@ void send_extra_file_list(int f, int at_least)
        past_and_present = cur_flist->ndx_start - first_flist->ndx_start
                         + cur_flist->count;
        while (file_total - past_and_present < at_least) {
-               start_write = stats.total_written;
                struct file_struct *file = dir_flist->files[send_dir_ndx];
                int32 *dp;
                int dlen;
@@ -1300,6 +1299,7 @@ void send_extra_file_list(int f, int at_least)
                }
 
                flist = flist_new(0, "send_extra_file_list");
+               start_write = stats.total_written;
 
                write_int(f, NDX_FLIST_OFFSET - send_dir_ndx);
                change_local_filter_dir(fbuf, dlen, send_dir_depth);