Changed the static file_struct var to match the changes in rsync.h.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index b2c3ee0..0832be4 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -91,19 +91,6 @@ void setup_iconv()
 }
 #endif
 
-static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-                               uchar fnamecmp_type, char *buf, int len)
-{
-       write_int(f_out, ndx);
-       if (protocol_version < 29)
-               return;
-       write_shortint(f_out, iflags);
-       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
-               write_byte(f_out, fnamecmp_type);
-       if (iflags & ITEM_XNAME_FOLLOWS)
-               write_vstring(f_out, buf, len);
-}
-
 /* This is used by sender.c with a valid f_out, and by receive.c with
  * f_out = -1. */
 int read_item_attrs(int f_in, int f_out, int ndx, uchar *type_ptr,
@@ -228,9 +215,9 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                        updated = 1;
        }
 
-       change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-       change_gid = preserve_gid && file->gid != GID_NONE
-               && st->st_gid != file->gid;
+       change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
+       change_gid = preserve_gid && F_GID(file) != GID_NONE
+               && st->st_gid != F_GID(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
        if (S_ISLNK(st->st_mode))
                ;
@@ -242,18 +229,18 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                                rprintf(FINFO,
                                        "set uid of %s from %ld to %ld\n",
                                        fname,
-                                       (long)st->st_uid, (long)file->uid);
+                                       (long)st->st_uid, (long)F_UID(file));
                        }
                        if (change_gid) {
                                rprintf(FINFO,
                                        "set gid of %s from %ld to %ld\n",
                                        fname,
-                                       (long)st->st_gid, (long)file->gid);
+                                       (long)st->st_gid, (long)F_GID(file));
                        }
                }
                if (do_lchown(fname,
-                   change_uid ? file->uid : st->st_uid,
-                   change_gid ? file->gid : st->st_gid) != 0) {
+                   change_uid ? F_UID(file) : st->st_uid,
+                   change_gid ? F_GID(file) : st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                         * unless have the privilege */
                        rsyserr(FERROR, errno, "%s %s failed",
@@ -274,7 +261,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
        if (daemon_chmod_modes && !S_ISLNK(new_mode))
                new_mode = tweak_mode(new_mode, daemon_chmod_modes);
 #ifdef HAVE_CHMOD
-       if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+       if (!BITS_EQUAL(st->st_mode, new_mode, CHMOD_BITS)) {
                int ret = do_chmod(fname, new_mode);
                if (ret < 0) {
                        rsyserr(FERROR, errno,