Improve the descriptions of the filter rule types.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 70da486..b85c0bb 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -96,7 +96,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
-#define SUBPROTOCOL_VERSION 5
+#define SUBPROTOCOL_VERSION 6
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -259,6 +259,10 @@ enum delret {
        DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY
 };
 
+/* Defines for make_path() */
+#define MKP_DROP_NAME          (1<<0) /* drop trailing filename or trailing slash */
+#define MKP_SKIP_SLASH         (1<<1) /* skip one or more leading slashes */
+
 #include "errcode.h"
 
 #include "config.h"
@@ -416,7 +420,7 @@ enum delret {
 # include <limits.h>
 #endif
 
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#if defined USE_ICONV_OPEN && defined HAVE_ICONV_H
 #include <iconv.h>
 #ifndef ICONV_CONST
 #define ICONV_CONST
@@ -815,15 +819,12 @@ struct map_struct {
 #define MATCHFLG_CLEAR_LIST    (1<<18)/* this item is the "!" token */
 #define MATCHFLG_PERISHABLE    (1<<19)/* perishable if parent dir goes away */
 
-#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \
-                               | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \
-                               | MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE \
-                               | MATCHFLG_PERISHABLE)
+#define MATCHFLGS_SIDES (MATCHFLG_SENDER_SIDE | MATCHFLG_RECEIVER_SIDE)
 
 struct filter_struct {
        struct filter_struct *next;
        char *pattern;
-       uint32 match_flags;
+       uint32 flags;
        union {
                int slash_cnt;
                struct filter_list_struct *mergelist;
@@ -853,8 +854,6 @@ struct stats {
        int xferred_files;
 };
 
-struct chmod_mode_struct;
-
 struct flist_ndx_item {
        struct flist_ndx_item *next;
        int ndx;