Moved read_item_attrs() from sender.c to rsync.c since the function

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 3914c51..178d9dd 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -89,6 +89,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
   */
@@ -120,8 +171,6 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int exists)
                /* Apply the umask and turn off special permissions. */
                new_mode = flist_mode & (~CHMOD_BITS | (ACCESSPERMS & ~orig_umask));
        }
-       if (daemon_chmod_modes && !S_ISLNK(flist_mode))
-               new_mode = tweak_mode(new_mode, daemon_chmod_modes);
        return new_mode;
 }
 
@@ -131,6 +180,7 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
+       mode_t new_mode = file->mode;
 
        if (!st) {
                if (dry_run)
@@ -141,11 +191,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                        return 0;
                }
                st = &st2;
-               if (!preserve_perms && S_ISDIR(file->mode)
+               if (!preserve_perms && S_ISDIR(new_mode)
                 && st->st_mode & S_ISGID) {
                        /* We just created this directory and its setgid
                         * bit is on, so make sure it stays on. */
-                       file->mode |= S_ISGID;
+                       new_mode |= S_ISGID;
                }
        }
 
@@ -206,9 +256,11 @@ int set_file_attrs(char *fname, struct file_struct *file, STRUCT_STAT *st,
                updated = 1;
        }
 
+       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) != (file->mode & CHMOD_BITS)) {
-               int ret = do_chmod(fname, file->mode);
+       if ((st->st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+               int ret = do_chmod(fname, new_mode);
                if (ret < 0) {
                        rsyserr(FERROR, errno,
                                "failed to set permissions on %s",