Add flist_find_ignore_dirness() and change delete_in_dir() to use it.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 320d340..b000d96 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -60,6 +60,7 @@
 #define XMIT_RDEV_MINOR_8_pre30 (1<<11)        /* protocols 28 - 29  */
 #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
 #define XMIT_HLINK_FIRST (1<<12)       /* protocols 30 - now (HLINKED files only) */
+#define XMIT_IO_ERROR_ENDLIST (1<<12)  /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */
 
 /* These flags are used in the live flist data. */
 
@@ -90,12 +91,12 @@
                             == ((unsigned)(b2) & (unsigned)(mask)))
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 30
+#define PROTOCOL_VERSION 31
 
 /* 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! */
-#define SUBPROTOCOL_VERSION 0
+ * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
+#define SUBPROTOCOL_VERSION 2
 
 /* 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
@@ -813,6 +814,7 @@ struct filter_struct {
 struct filter_list_struct {
        struct filter_struct *head;
        struct filter_struct *tail;
+       struct filter_struct *parent_dirscan_head;
        char *debug_type;
 };
 
@@ -826,12 +828,23 @@ struct stats {
        int64 flist_buildtime;
        int64 flist_xfertime;
        int64 flist_size;
-       int num_files;
-       int num_transferred_files;
+       int num_files, num_dirs, num_symlinks, num_devices, num_specials;
+       int created_files, created_dirs, created_symlinks, created_devices, created_specials;
+       int deleted_files, deleted_dirs, deleted_symlinks, deleted_devices, deleted_specials;
+       int xferred_files;
 };
 
 struct chmod_mode_struct;
 
+struct flist_ndx_item {
+       struct flist_ndx_item *next;
+       int ndx;
+};
+
+typedef struct {
+       struct flist_ndx_item *head, *tail;
+} flist_ndx_list;
+
 #define EMPTY_ITEM_LIST {NULL, 0, 0}
 
 typedef struct {
@@ -1158,7 +1171,8 @@ extern short info_levels[], debug_levels[];
 #define DEBUG_FLIST (DEBUG_FILTER+1)
 #define DEBUG_FUZZY (DEBUG_FLIST+1)
 #define DEBUG_GENR (DEBUG_FUZZY+1)
-#define DEBUG_HLINK (DEBUG_GENR+1)
+#define DEBUG_HASH (DEBUG_GENR+1)
+#define DEBUG_HLINK (DEBUG_HASH+1)
 #define DEBUG_ICONV (DEBUG_HLINK+1)
 #define DEBUG_OWN (DEBUG_ICONV+1)
 #define DEBUG_PROTO (DEBUG_OWN+1)