X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/419896af4764f9050bcfabe6098c1b8ea84d4f43..8aa81e06e644bb1632e07e041e409c7149fd13d5:/rsync.h

diff --git a/rsync.h b/rsync.h
index d62767a9..61e5f06b 100644
--- a/rsync.h
+++ b/rsync.h
@@ -39,23 +39,26 @@
    incompatible with older versions :-( */
 #define CHAR_OFFSET 0
 
-
-#define FLAG_DELETE (1<<0)
-#define SAME_MODE (1<<1)
-#define EXTENDED_FLAGS (1<<2)
-#define SAME_RDEV_pre28 EXTENDED_FLAGS /* Only use in protocols < 28 */
-#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)
-#define HAS_INODE_DATA (1<<9)
-#define SAME_DEV (1<<10)
-
-/* What flags are relevant after the transfer of the flist is complete? */
-#define LIVE_FLAGS FLAG_DELETE
+/* These flags are only used during the flist transfer. */
+
+#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_UID (1<<3)
+#define XMIT_SAME_GID (1<<4)
+#define XMIT_SAME_NAME (1<<5)
+#define XMIT_LONG_NAME (1<<6)
+#define XMIT_SAME_TIME (1<<7)
+#define XMIT_SAME_HIGH_RDEV (1<<8)
+#define XMIT_HAS_IDEV_DATA (1<<9)
+#define XMIT_SAME_DEV (1<<10)
+
+/* These flags are used in the live flist data. */
+
+#define FLAG_TOP_DIR (1<<0)
+#define FLAG_HLINK_EOL (1<<1)	/* generator only */
+#define FLAG_MOUNT_POINT (1<<2)	/* sender only */
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 28
@@ -109,6 +112,9 @@
 #define FULL_FLUSH	1
 #define NORMAL_FLUSH	0
 
+#define CLEAR_STRUCT	0
+#define FREE_STRUCT	1
+
 /* Log-message categories.  FLOG is only used on the daemon side to
  * output messages to the log file. */
 enum logcode { FERROR=1, FINFO=2, FLOG=3 };
@@ -382,8 +388,11 @@ enum msgcode {
 
 #define GID_NONE (gid_t) -1
 
+#define HL_CHECK_MASTER	0
+#define HL_SKIP		1
+
 struct hlink {
-	struct file_struct *head;
+	int hlindex;
 	struct file_struct *next;
 };
 
@@ -395,7 +404,7 @@ struct idev {
 #define F_DEV	link_u.idev->dev
 #define F_INODE	link_u.idev->inode
 
-#define F_HEAD	link_u.links->head
+#define F_HLINDEX link_u.links->hlindex
 #define F_NEXT	link_u.links->next
 
 struct file_struct {
@@ -416,7 +425,7 @@ struct file_struct {
 	char *basedir;
 	uid_t uid;
 	gid_t gid;
-	unsigned short flags;
+	uchar flags;	/* this item MUST remain last */
 };
 
 #define ARENA_SIZE	(32 * 1024)
@@ -703,6 +712,17 @@ size_t strlcat(char *d, const char *s, size_t bufsize);
 
 #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)
 
+#ifdef HAVE_GETEUID
+#define MY_UID() geteuid()
+#else
+#define MY_UID() getuid()
+#endif
+
+#ifdef HAVE_GETEGID
+#define MY_GID() getegid()
+#else
+#define MY_GID() getgid()
+#endif
 
 extern int verbose;