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 25b0629..0832be4 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -42,6 +42,7 @@ extern int am_sender;
 extern int am_generator;
 extern int am_starting_up;
 extern int allow_8bit_chars;
+extern int protocol_version;
 extern int preserve_uid;
 extern int preserve_gid;
 extern int inplace;
@@ -49,6 +50,7 @@ extern int keep_dirlinks;
 extern int make_backups;
 extern mode_t orig_umask;
 extern struct stats stats;
+extern struct file_list *the_file_list;
 extern struct chmod_mode_struct *daemon_chmod_modes;
 
 #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
@@ -89,6 +91,57 @@ void setup_iconv()
 }
 #endif
 
+/* 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,
+                   char *buf, int *len_ptr)
+{
+       int len;
+       uchar fnamecmp_type = FNAMECMP_FNAME;
+       int iflags = protocol_version >= 29 ? read_shortint(f_in)
+                  : ITEM_TRANSFER | ITEM_MISSING_DATA;
+
+       /* Handle the new keep-alive (no-op) packet. */
+       if (ndx == the_file_list->count && iflags == ITEM_IS_NEW)
+               ;
+       else if (ndx < 0 || ndx >= the_file_list->count) {
+               rprintf(FERROR, "Invalid file index: %d (count=%d) [%s]\n",
+                       ndx, the_file_list->count, who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
+       } else if (iflags == ITEM_IS_NEW) {
+               rprintf(FERROR, "Invalid itemized flag word: %x [%s]\n",
+                       iflags, who_am_i());
+               exit_cleanup(RERR_PROTOCOL);
+       }
+
+       if (iflags & ITEM_BASIS_TYPE_FOLLOWS)
+               fnamecmp_type = read_byte(f_in);
+       *type_ptr = fnamecmp_type;
+
+       if (iflags & ITEM_XNAME_FOLLOWS) {
+               if ((len = read_vstring(f_in, buf, MAXPATHLEN)) < 0)
+                       exit_cleanup(RERR_PROTOCOL);
+       } else {
+               *buf = '\0';
+               len = -1;
+       }
+       *len_ptr = len;
+
+       if (iflags & ITEM_TRANSFER) {
+               if (!S_ISREG(the_file_list->files[ndx]->mode)) {
+                       rprintf(FERROR,
+                               "received request to transfer non-regular file: %d [%s]\n",
+                               ndx, who_am_i());
+                       exit_cleanup(RERR_PROTOCOL);
+               }
+       } else if (f_out >= 0) {
+               write_ndx_and_attrs(f_out, ndx, iflags,
+                                   fnamecmp_type, buf, len);
+       }
+
+       return iflags;
+}
+
 /*
   free a sums struct
   */
@@ -162,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))
                ;
@@ -176,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",
@@ -208,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,