X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/59e52bf27680e626f26525e009b975247c80d744..30e66e53de71a64ca1a3900bda08a4129888fb44:/rsync.h

diff --git a/rsync.h b/rsync.h
index 41ee7fd0..49bff0bd 100644
--- a/rsync.h
+++ b/rsync.h
@@ -132,7 +132,6 @@
 #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)
@@ -146,21 +145,25 @@
 #define ITEM_REPORT_OWNER (1<<5)
 #define ITEM_REPORT_GROUP (1<<6)
 #define ITEM_IS_NEW (1<<7)
+#define ITEM_USING_ALT_BASIS (1<<8)
 
-#define ITEM_MISSING_DATA (1<<16) /* this is outside the transmitted flags */
+#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. */
-enum logcode { FERROR=1, FINFO=2, FLOG=3 };
+/* Log-message categories.  FLOG and FCLIENT are only used on the daemon
+ * side for custom logging -- they don't get sent over the socket. */
+enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4 };
 
 /* Messages types that are sent over the message channel.  The logcode
  * values must all be present here with identical numbers. */
 enum msgcode {
-	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 */
-	MSG_DATA=0	/* raw data on the multiplexed stream */
+	MSG_DATA=0,	/* raw data on the multiplexed stream */
+	MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
+	MSG_LOG=FLOG, MSG_FCLIENT=FCLIENT, /* 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 */
+	MSG_DONE=86	/* current phase is done */
 };
 
 #include "errcode.h"
@@ -295,7 +298,7 @@ enum msgcode {
 
 #ifdef MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
-# if !defined makedev && defined mkdev
+# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__)
 #  define makedev mkdev
 # endif
 #elif defined MAJOR_IN_SYSMACROS