#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. */
== ((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 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
#define OLD_PROTOCOL_VERSION 25
#define MAX_PROTOCOL_VERSION 40
-#define FILECNT_LOOKAHEAD 1000
+#define MIN_FILECNT_LOOKAHEAD 1000
+#define MAX_FILECNT_LOOKAHEAD 10000
#define RSYNC_PORT 873
MSG_ERROR_UTF8=FERROR_UTF8, /* sibling logging */
MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, /* sibling logging */
MSG_REDO=9, /* reprocess indicated flist index */
+ MSG_DEL_STATS=10,/* delete-statistics data follows */
MSG_FLIST=20, /* extra file list over sibling socket */
MSG_FLIST_EOF=21,/* we've transmitted all the file lists */
MSG_IO_ERROR=22,/* the sending side had an I/O error */
#define NDX_DONE -1
#define NDX_FLIST_EOF -2
+#define NDX_DEL_STATS -2
#define NDX_FLIST_OFFSET -101
+/* For calling delete_item() and delete_dir_contents(). */
+#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */
+#define DEL_RECURSE (1<<1) /* if dir, delete all contents */
+#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
+#define DEL_FOR_FILE (1<<3) /* making room for a replacement file */
+#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */
+#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */
+#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */
+#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */
+#define DEL_FOR_BACKUP (1<<8) /* the delete is for a backup operation */
+
+#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL)
+
+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"
# 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
int status; /* first errno from read errors */
};
-#define MATCHFLG_WILD (1<<0) /* pattern has '*', '[', and/or '?' */
-#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
-#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with "**" */
-#define MATCHFLG_WILD3_SUFFIX (1<<3) /* pattern ends with "***" */
-#define MATCHFLG_ABS_PATH (1<<4) /* path-match on absolute path */
-#define MATCHFLG_INCLUDE (1<<5) /* this is an include, not an exclude */
-#define MATCHFLG_DIRECTORY (1<<6) /* this matches only directories */
-#define MATCHFLG_WORD_SPLIT (1<<7) /* split rules on whitespace */
-#define MATCHFLG_NO_INHERIT (1<<8) /* don't inherit these rules */
-#define MATCHFLG_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */
-#define MATCHFLG_MERGE_FILE (1<<10)/* specifies a file to merge */
-#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 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)
-
-struct filter_struct {
+#define FILTRULE_WILD (1<<0) /* pattern has '*', '[', and/or '?' */
+#define FILTRULE_WILD2 (1<<1) /* pattern has '**' */
+#define FILTRULE_WILD2_PREFIX (1<<2) /* pattern starts with "**" */
+#define FILTRULE_WILD3_SUFFIX (1<<3) /* pattern ends with "***" */
+#define FILTRULE_ABS_PATH (1<<4) /* path-match on absolute path */
+#define FILTRULE_INCLUDE (1<<5) /* this is an include, not an exclude */
+#define FILTRULE_DIRECTORY (1<<6) /* this matches only directories */
+#define FILTRULE_WORD_SPLIT (1<<7) /* split rules on whitespace */
+#define FILTRULE_NO_INHERIT (1<<8) /* don't inherit these rules */
+#define FILTRULE_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */
+#define FILTRULE_MERGE_FILE (1<<10)/* specifies a file to merge */
+#define FILTRULE_PERDIR_MERGE (1<<11)/* merge-file is searched per-dir */
+#define FILTRULE_EXCLUDE_SELF (1<<12)/* merge-file name should be excluded */
+#define FILTRULE_FINISH_SETUP (1<<13)/* per-dir merge file needs setup */
+#define FILTRULE_NEGATE (1<<14)/* rule matches when pattern does not */
+#define FILTRULE_CVS_IGNORE (1<<15)/* rule was -C or :C */
+#define FILTRULE_SENDER_SIDE (1<<16)/* rule applies to the sending side */
+#define FILTRULE_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */
+#define FILTRULE_CLEAR_LIST (1<<18)/* this item is the "!" token */
+#define FILTRULE_PERISHABLE (1<<19)/* perishable if parent dir goes away */
+
+#define FILTRULES_SIDES (FILTRULE_SENDER_SIDE | FILTRULE_RECEIVER_SIDE)
+
+typedef struct filter_struct {
struct filter_struct *next;
char *pattern;
- uint32 match_flags;
+ uint32 rflags;
union {
int slash_cnt;
struct filter_list_struct *mergelist;
} u;
-};
+} filter_rule;
-struct filter_list_struct {
- struct filter_struct *head;
- struct filter_struct *tail;
+typedef struct filter_list_struct {
+ filter_rule *head;
+ filter_rule *tail;
+ filter_rule *parent_dirscan_head;
char *debug_type;
-};
+} filter_rule_list;
struct stats {
int64 total_size;
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 {
#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)
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff