X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1c3344a105f656a45f6b46e1710c3fc4ab862a9a..896f046f79252045e6044482add0f8ef24bde911:/flist.c

diff --git a/flist.c b/flist.c
index b61e164b..a2bbc919 100644
--- a/flist.c
+++ b/flist.c
@@ -22,6 +22,7 @@
 
 #include "rsync.h"
 #include "rounding.h"
+#include "io.h"
 
 extern int verbose;
 extern int list_only;
@@ -382,8 +383,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 				flags |= XMIT_SAME_RDEV_MAJOR;
 			else
 				rdev_major = major(rdev);
-			if ((uint32)minor(rdev) <= 0xFFu)
-				flags |= XMIT_RDEV_MINOR_IS_SMALL;
+			if (protocol_version < 30 && (uint32)minor(rdev) <= 0xFFu)
+				flags |= XMIT_RDEV_MINOR_8_pre30;
 		}
 	} else if (protocol_version < 28)
 		rdev = MAKEDEV(0, 0);
@@ -483,19 +484,27 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		write_abbrevint30(f, uid);
-		if (flags & XMIT_USER_NAME_FOLLOWS) {
-			int len = strlen(user_name);
-			write_byte(f, len);
-			write_buf(f, user_name, len);
+		if (protocol_version < 30)
+			write_int(f, uid);
+		else {
+			write_abbrevint(f, uid);
+			if (flags & XMIT_USER_NAME_FOLLOWS) {
+				int len = strlen(user_name);
+				write_byte(f, len);
+				write_buf(f, user_name, len);
+			}
 		}
 	}
 	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-		write_abbrevint30(f, gid);
-		if (flags & XMIT_GROUP_NAME_FOLLOWS) {
-			int len = strlen(group_name);
-			write_byte(f, len);
-			write_buf(f, group_name, len);
+		if (protocol_version < 30)
+			write_int(f, gid);
+		else {
+			write_abbrevint(f, gid);
+			if (flags & XMIT_GROUP_NAME_FOLLOWS) {
+				int len = strlen(group_name);
+				write_byte(f, len);
+				write_buf(f, group_name, len);
+			}
 		}
 	}
 	if ((preserve_devices && IS_DEVICE(mode))
@@ -505,8 +514,10 @@ static void send_file_entry(int f, struct file_struct *file, int ndx)
 				write_int(f, (int)rdev);
 		} else {
 			if (!(flags & XMIT_SAME_RDEV_MAJOR))
-				write_int(f, major(rdev));
-			if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+				write_abbrevint30(f, major(rdev));
+			if (protocol_version >= 30)
+				write_abbrevint(f, minor(rdev));
+			else if (flags & XMIT_RDEV_MINOR_8_pre30)
 				write_byte(f, minor(rdev));
 			else
 				write_int(f, minor(rdev));
@@ -641,6 +652,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		 || (preserve_specials && IS_SPECIAL(mode))) {
 			uint32 *devp = F_RDEV_P(first);
 			rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
+			extra_len += 2 * EXTRA_LEN;
 		}
 		if (preserve_links && S_ISLNK(mode))
 			linkname_len = strlen(F_SYMLINK(first)) + 1;
@@ -660,18 +672,26 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		mode = tweak_mode(mode, chmod_modes);
 
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
-		uid = (uid_t)read_abbrevint30(f);
-		if (flags & XMIT_USER_NAME_FOLLOWS)
-			uid = recv_user_name(f, uid);
-		else if (inc_recurse && am_root && !numeric_ids)
-			uid = match_uid(uid);
+		if (protocol_version < 30)
+			uid = (uid_t)read_int(f);
+		else {
+			uid = (uid_t)read_abbrevint(f);
+			if (flags & XMIT_USER_NAME_FOLLOWS)
+				uid = recv_user_name(f, uid);
+			else if (inc_recurse && am_root && !numeric_ids)
+				uid = match_uid(uid);
+		}
 	}
 	if (preserve_gid && !(flags & XMIT_SAME_GID)) {
-		gid = (gid_t)read_abbrevint30(f);
-		if (flags & XMIT_GROUP_NAME_FOLLOWS)
-			gid = recv_group_name(f, gid);
-		else if (inc_recurse && (!am_root || !numeric_ids))
-			gid = match_gid(gid);
+		if (protocol_version < 30)
+			gid = (gid_t)read_int(f);
+		else {
+			gid = (gid_t)read_abbrevint(f);
+			if (flags & XMIT_GROUP_NAME_FOLLOWS)
+				gid = recv_group_name(f, gid);
+			else if (inc_recurse && (!am_root || !numeric_ids))
+				gid = match_gid(gid);
+		}
 	}
 
 	if ((preserve_devices && IS_DEVICE(mode))
@@ -682,8 +702,10 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
 		} else {
 			uint32 rdev_minor;
 			if (!(flags & XMIT_SAME_RDEV_MAJOR))
-				rdev_major = read_int(f);
-			if (flags & XMIT_RDEV_MINOR_IS_SMALL)
+				rdev_major = read_abbrevint30(f);
+			if (protocol_version >= 30)
+				rdev_minor = read_abbrevint(f);
+			else if (flags & XMIT_RDEV_MINOR_8_pre30)
 				rdev_minor = read_byte(f);
 			else
 				rdev_minor = read_int(f);