X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a60e2dca6b475e41882d9070c90079dfedf6b5bc..02a279a75f366f569fbab8cb49d6e8a0602195b7:/rsync.h

diff --git a/rsync.h b/rsync.h
index 9e3eba17..e68423b7 100644
--- a/rsync.h
+++ b/rsync.h
@@ -42,13 +42,15 @@
 
 #define FLAG_DELETE (1<<0)
 #define SAME_MODE (1<<1)
-#define SAME_RDEV (1<<2)
+#define EXTENDED_FLAGS (1<<2)
+#define OLD_SAME_RDEV EXTENDED_FLAGS
 #define SAME_UID (1<<3)
 #define SAME_GID (1<<4)
 #define SAME_DIR (1<<5)
 #define SAME_NAME SAME_DIR
 #define LONG_NAME (1<<6)
 #define SAME_TIME (1<<7)
+#define SAME_HIGH_RDEV (1<<8)
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 27
@@ -70,7 +72,7 @@
  * unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and
  * MAX_PROTOCOL_VERSION. */
 
-#define MIN_PROTOCOL_VERSION 17
+#define MIN_PROTOCOL_VERSION 19
 #define OLD_PROTOCOL_VERSION 20
 #define MAX_PROTOCOL_VERSION 40
 
@@ -365,7 +367,6 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 #define GID_NONE (gid_t) -1
 
 struct file_struct {
-	unsigned flags;
 	time_t modtime;
 	OFF_T length;
 	mode_t mode;
@@ -383,6 +384,7 @@ struct file_struct {
 	char *basedir;
 	char *link;
 	char *sum;
+	unsigned short flags;
 };
 
 
@@ -404,7 +406,7 @@ struct file_list {
 
 struct sum_buf {
 	OFF_T offset;		/**< offset in file of this chunk */
-	int len;		/**< length of chunk of file */
+	unsigned int len;	/**< length of chunk of file */
 	int i;			/**< index of this chunk */
 	uint32 sum1;	        /**< simple checksum */
 	char sum2[SUM_LENGTH];	/**< checksum  */
@@ -413,9 +415,9 @@ struct sum_buf {
 struct sum_struct {
 	OFF_T flength;		/**< total file length */
 	size_t count;		/**< how many chunks */
-	size_t remainder;	/**< flength % block_length */
-	size_t blength;		/**< block_length */
-	size_t s2length;	/**< sum2_length */
+	unsigned int blength;	/**< block_length */
+	unsigned int remainder;	/**< flength % block_length */
+	int s2length;		/**< sum2_length */
 	struct sum_buf *sums;	/**< points to info for each chunk */
 };