Renamed XMIT_HAS_IDEV_DATA to XMIT_HLINKED.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 9b7fd3f..7faffcc 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -51,7 +51,7 @@
 #define XMIT_LONG_NAME (1<<6)
 #define XMIT_SAME_TIME (1<<7)
 #define XMIT_SAME_RDEV_MAJOR (1<<8)
-#define XMIT_HAS_IDEV_DATA (1<<9)
+#define XMIT_HLINKED (1<<9)
 #define XMIT_SAME_DEV (1<<10)
 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
 
@@ -65,7 +65,13 @@
 #define FLAG_HLINKED (1<<5)    /* receiver/generator */
 #define FLAG_HLINK_FIRST (1<<6)        /* receiver/generator */
 #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */
-#define FLAG_LENGTH64 (1<<8)   /* sender/receiver/generator */
+#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
+#define FLAG_LENGTH64 (1<<9)   /* sender/receiver/generator */
+
+#define BITS_SET(val,bits) (((val) & (bits)) == (bits))
+#define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits))
+#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \
+                            == ((unsigned)(b2) & (unsigned)(mask)))
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 30
@@ -170,7 +176,7 @@ enum logcode { FNONE=0, FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 };
 enum msgcode {
        MSG_DATA=0,     /* raw data on the multiplexed stream */
        MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
-       MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
+       MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */
        MSG_REDO=9,     /* reprocess indicated flist index */
        MSG_SUCCESS=100,/* successfully updated indicated flist index */
        MSG_DELETED=101,/* successfully deleted a file on receiving side */
@@ -498,21 +504,12 @@ struct idev {
 
 #define GID_NONE ((gid_t)-1)
 
-#define HL_CHECK_MASTER        0
-#define HL_SKIP                1
-
-struct hlist {
-       int32 next;
-       int32 hlindex;
-       unsigned short dest_used;
-};
-
 struct file_struct {
        union flist_extras {
                uid_t uid;           /* The user ID number */
                uid_t gid;           /* The group ID number or GID_NONE */
                struct idev *idev;   /* The hard-link info during matching */
-               struct hlist *hlist; /* The hard-link info after matching */
+               int32 num;           /* A signed number */
                uint32 unum;         /* An unsigned number */
        } extras[1];
        time_t modtime;              /* When the item was last modified */
@@ -537,13 +534,18 @@ extern int preserve_gid;
 
 #define REQ_EXTRA(f,ndx) ((f)->extras - (ndx - 1))
 #define OPT_EXTRA(f,bump) ((f)->extras - flist_extra_cnt - (bump))
+
 #define LEN64_BUMP(f) ((f)->flags & FLAG_LENGTH64 ? 1 : 0)
 #define HLINK_BUMP(f) (F_IS_HLINKED(f) ? 1 : 0)
 
 /* Basename (AKA filename) and length applies to all items */
 #define F_BASENAME(f) ((const char*)(f) + FILE_STRUCT_LEN)
-#define F_LENGTH(f) ((OFF_T)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \
-                  ? (OFF_T)OPT_EXTRA(f, 0)->unum << 32 : 0u))
+#if SIZEOF_INT64 < 8
+#define F_LENGTH(f) ((int64)(f)->len32)
+#else
+#define F_LENGTH(f) ((int64)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \
+                  ? (int64)OPT_EXTRA(f, 0)->unum << 32 : 0))
+#endif
 
 /* If there is a symlink string, it is always right after the basename */
 #define F_SYMLINK(f) (F_BASENAME(f) + strlen(F_BASENAME(f)) + 1)
@@ -552,22 +554,26 @@ extern int preserve_gid;
 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
 
-/* These are per-entry optional and mutally exclusive: */
-#define F_IDEV(f)  OPT_EXTRA(f, LEN64_BUMP(f))->idev
-#define F_HLIST(f) OPT_EXTRA(f, LEN64_BUMP(f))->hlist
+/* These items are per-entry optional and mutally exclusive: */
+#define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+#define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
 
-/* These are per-entry optional, but always both or neither:
- * (Note: a device doesn't need to use LEN64_BUMP(f).) */
-#define F_DMAJOR(f) OPT_EXTRA(f, HLINK_BUMP(f))->unum
-#define F_DMINOR(f) OPT_EXTRA(f, HLINK_BUMP(f) + 1)->unum
+/* This optional item might follow an F_HL_*() item.
+ * (Note: a device doesn't need to check LEN64_BUMP(f).) */
+#define F_RDEV_P(f) (&OPT_EXTRA(f, HLINK_BUMP(f) + 2 - 1)->unum)
 
 /* The sum is only present on regular files. */
 #define F_SUM(f) ((const char*)OPT_EXTRA(f, LEN64_BUMP(f) + HLINK_BUMP(f) \
                                          + SUM_EXTRA_CNT - 1))
 
-/* A couple bool-type utility functions: */
-#define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED)
+/* Some utility defines: */
 #define F_IS_ACTIVE(f) F_BASENAME(f)[0]
+#define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED)
+#define F_HLINK_NOT_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST)
+#define F_HLINK_NOT_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST)
+
+#define DEV_MAJOR(a) (a)[0]
+#define DEV_MINOR(a) (a)[1]
 
 /*
  * Start the flist array at FLIST_START entries and grow it
@@ -588,13 +594,9 @@ extern int preserve_gid;
 #define FILE_EXTENT    (256 * 1024)
 #define HLINK_EXTENT   (128 * 1024)
 
-#define WITH_HLINK     1
-#define WITHOUT_HLINK  0
-
 struct file_list {
        struct file_struct **files;
        alloc_pool_t file_pool;
-       alloc_pool_t hlink_pool;
        int count, malloced;
        int low, high; /* 0-relative index values excluding empties */
 };