X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/caf5cc91528b8fb52bfb49520c5942be0e36f2b6..d17e1dd2dae6bfd9e2e147a0dd3039848dd43abc:/rsync.h

diff --git a/rsync.h b/rsync.h
index 10c128e3..bc009582 100644
--- a/rsync.h
+++ b/rsync.h
@@ -55,7 +55,7 @@
 #define SAME_DEV (1<<10)
 
 /* What flags are relevant after the transfer of the flist is complete? */
-#define LIVE_FLAGS (FLAG_DELETE|HAS_INODE_DATA)
+#define LIVE_FLAGS FLAG_DELETE
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 28
@@ -371,28 +371,43 @@ enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
 
 #define GID_NONE (gid_t) -1
 
-struct file_struct {
-	time_t modtime;
-	OFF_T length;
-	mode_t mode;
+struct hlink {
+	struct file_struct *head;
+	struct file_struct *next;
+};
 
+struct idev {
 	INO64_T inode;
-	/** Device this file lives upon */
 	DEV64_T dev;
+};
 
-	/** If this is a device node, the device number. */
-	DEV64_T rdev;
-	uid_t uid;
-	gid_t gid;
+#define F_DEV	link_u.idev->dev
+#define F_INODE	link_u.idev->inode
+
+#define F_HEAD	link_u.links->head
+#define F_NEXT	link_u.links->next
+
+struct file_struct {
+	time_t modtime;
+	OFF_T length;
+	mode_t mode;
+	union {
+		DEV64_T rdev;	/* The device number, if this is a device */
+		char *sum;	/* Only a normal file can have a checksum */
+		char *link;	/* Holds symlink string, if a symlink */
+	} u;
+	union {
+		struct idev *idev;
+		struct hlink *links;
+	} link_u;
 	char *basename;
 	char *dirname;
 	char *basedir;
-	char *link;
-	char *sum;
+	uid_t uid;
+	gid_t gid;
 	unsigned short flags;
 };
 
-
 #define ARENA_SIZE	(32 * 1024)
 
 struct string_area {
@@ -462,6 +477,7 @@ struct stats {
 	int flist_size;
 	int num_files;
 	int num_transferred_files;
+	int current_file_index;
 };