X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ec33e0e6bd0247fdf9bed77b1c21300d63c284b2..fe1c19dcdfa000c2461e85ed7bf712de49904377:/rsync.h

diff --git a/rsync.h b/rsync.h
index 5174f014..75e3a26b 100644
--- a/rsync.h
+++ b/rsync.h
@@ -109,12 +109,8 @@
 #define ALL_FILTERS	2
 
 #define XFLG_FATAL_ERRORS	(1<<0)
-#define XFLG_DEF_INCLUDE	(1<<1)
-#define XFLG_DEF_EXCLUDE	(1<<2)
-#define XFLG_WORD_SPLIT 	(1<<3)
-#define XFLG_DIRECTORY	 	(1<<4)
-#define XFLG_NO_PREFIXES 	(1<<5)
-#define XFLG_ANCHORED2ABS	(1<<6)
+#define XFLG_OLD_PREFIXES	(1<<1)
+#define XFLG_ANCHORED2ABS	(1<<2)
 
 #define PERMS_REPORT		(1<<0)
 #define PERMS_SKIP_MTIME	(1<<1)
@@ -567,10 +563,19 @@ struct map_struct {
 #define MATCHFLG_PERDIR_MERGE	(1<<11)/* merge-file is searched per-dir */
 #define MATCHFLG_EXCLUDE_SELF	(1<<12)/* merge-file name should be excluded */
 #define MATCHFLG_FINISH_SETUP	(1<<13)/* per-dir merge file needs setup */
+#define MATCHFLG_NEGATE 	(1<<14)/* rule matches when pattern does not */
+#define MATCHFLG_CVS_IGNORE	(1<<15)/* rule was -C or :C */
+#define MATCHFLG_SENDER_SIDE	(1<<16)/* rule applies to the sending side */
+#define MATCHFLG_RECEIVER_SIDE	(1<<17)/* rule applies to the receiving side */
+
+#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \
+				| MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \
+				| MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE)
+
 struct filter_struct {
 	struct filter_struct *next;
 	char *pattern;
-	unsigned int match_flags;
+	uint32 match_flags;
 	union {
 		int slash_cnt;
 		struct filter_list_struct *mergelist;
@@ -749,7 +754,7 @@ extern int errno;
 #define INITACCESSPERMS 0700
 
 /* handler for null strings in printf format */
-#define NS(s) ((s)?(s):"<NULL>")
+#define NS(s) ((s)?safe_fname(s):"<NULL>")
 
 #if !defined(__GNUC__) || defined(APPLE)
 /* Apparently the OS X port of gcc gags on __attribute__.