extern int delete_mode;
extern int delete_before;
extern int delete_during;
-@@ -479,10 +480,11 @@ void itemize(struct file_struct *file, i
+@@ -550,10 +551,11 @@ void itemize(struct file_struct *file, i
iflags |= ITEM_REPORT_TIME;
- if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ if ((unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
+ if (preserve_uid && am_root && F_UID(file) != st->st_uid
iflags |= ITEM_REPORT_GROUP;
} else
iflags |= ITEM_IS_NEW;
-@@ -1088,7 +1090,7 @@ static void recv_generator(char *fname,
+@@ -1169,7 +1171,7 @@ static void recv_generator(char *fname,
/* If we're not preserving permissions, change the file-list's
* mode based on the local permissions and some heuristics. */
+extern int omit_dir_changes;
extern int basis_dir_cnt;
extern int make_backups;
- extern int flist_extra_ndx;
-@@ -551,7 +552,7 @@ int recv_files(int f_in, struct file_lis
+ extern int cleanup_got_literal;
+@@ -543,7 +544,7 @@ int recv_files(int f_in, struct file_lis
/* If we're not preserving permissions, change the file-list's
* mode based on the local permissions and some heuristics. */