X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0dd046d36f41bbabba9261152c9891bc78fcabac..c786a7aec545259f857212a2376ee4c274d2e3b6:/rsync.h

diff --git a/rsync.h b/rsync.h
index 488b4010..895cd7c9 100644
--- a/rsync.h
+++ b/rsync.h
@@ -62,6 +62,7 @@
 #define FLAG_MOUNT_POINT (1<<2)	/* sender only */
 #define FLAG_NO_FUZZY (1<<2)	/* generator only */
 #define FLAG_DEL_HERE (1<<3)	/* receiver/generator */
+#define FLAG_SENT (1<<3)	/* sender only */
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 29
@@ -131,11 +132,22 @@
 #define FNAMECMP_FUZZY		0x83
 
 /* For calling delete_file() */
-#define DEL_DIR 		(1<<0)
 #define DEL_NO_RECURSE		(1<<1)
 #define DEL_FORCE_RECURSE	(1<<2) /* recurse even w/o --force */
 #define DEL_TERSE		(1<<3)
 
+/* For use by the itemize_changes code */
+#define ITEM_UPDATING (1<<0)
+#define ITEM_REPORT_CHECKSUM (1<<1)
+#define ITEM_REPORT_SIZE (1<<2)
+#define ITEM_REPORT_TIME (1<<3)
+#define ITEM_REPORT_PERMS (1<<4)
+#define ITEM_REPORT_OWNER (1<<5)
+#define ITEM_REPORT_GROUP (1<<6)
+#define ITEM_IS_NEW (1<<7)
+
+#define ITEM_MISSING_DATA (1<<16) /* these are outside the transmitted flags */
+#define ITEM_DELETED (1<<17)
 
 /* Log-message categories.  FLOG is only used on the daemon side to
  * output messages to the log file. */
@@ -144,6 +156,8 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3 };
 /* Messages types that are sent over the message channel.  The logcode
  * values must all be present here with identical numbers. */
 enum msgcode {
+	MSG_DELETED=7,	/* successfully deleted a file on receiving side */
+	MSG_SUCCESS=6,	/* successfully updated indicated flist index */
 	MSG_DONE=5,	/* current phase is done */
 	MSG_REDO=4,	/* reprocess indicated flist index */
 	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
@@ -533,7 +547,7 @@ struct sum_buf {
 struct sum_struct {
 	OFF_T flength;		/**< total file length */
 	struct sum_buf *sums;	/**< points to info for each chunk */
-	size_t count;		/**< how many chunks */
+	int32 count;		/**< how many chunks */
 	int32 blength;		/**< block_length */
 	int32 remainder;	/**< flength % block_length */
 	int s2length;		/**< sum2_length */
@@ -758,7 +772,7 @@ extern int errno;
 /* handler for null strings in printf format */
 #define NS(s) ((s)?safe_fname(s):"<NULL>")
 
-#if !defined __GNUC__ || defined APPLE
+#if !defined __GNUC__ || defined __APPLE__
 /* Apparently the OS X port of gcc gags on __attribute__.
  *
  * <http://www.opensource.apple.com/bugs/X/gcc/2512150.html> */