- The XMIT_SAME_DEV define is now pre-protocol-30 specific.

- Added XMIT_HLINK_FIRST define.
- Added struct idev_node.
- Added F_HL_GNUM() for protocol 30 (used in place of F_HL_IDEV()).

diff --git a/rsync.h b/rsync.h
index 7faffcc..c2a4e67 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -44,7 +44,7 @@
 #define XMIT_TOP_DIR (1<<0)
 #define XMIT_SAME_MODE (1<<1)
 #define XMIT_EXTENDED_FLAGS (1<<2)
-#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */
+#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* protocols < 28 */
 #define XMIT_SAME_UID (1<<3)
 #define XMIT_SAME_GID (1<<4)
 #define XMIT_SAME_NAME (1<<5)
@@ -52,7 +52,8 @@
 #define XMIT_SAME_TIME (1<<7)
 #define XMIT_SAME_RDEV_MAJOR (1<<8)
 #define XMIT_HLINKED (1<<9)
-#define XMIT_SAME_DEV (1<<10)
+#define XMIT_SAME_DEV_pre30 (1<<10)    /* protocols < 30 */
+#define XMIT_HLINK_FIRST (1<<10)       /* protocols >= 30 */
 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
 
 /* These flags are used in the live flist data. */
@@ -460,6 +461,11 @@ struct idev {
        int64 dev;
 };
 
+struct idev_node {
+       int64 key;
+       void *data;
+};
+
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
@@ -556,6 +562,7 @@ extern int preserve_gid;
 
 /* These items are per-entry optional and mutally exclusive: */
 #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
 #define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
 
 /* This optional item might follow an F_HL_*() item.