/* 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 2
+#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 NO_FILTERS 0
#define SERVER_FILTERS 1
#define ALL_FILTERS 2
+/* Don't let the file be excluded, but check for a filter that might affect
+ * its attributes via MATCHFLGS_ATTRS. */
+#define ALL_FILTERS_NO_EXCLUDE 3
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
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(). */
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 */
};
+struct chmod_mode_struct;
+
#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_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 MATCHFLG_CHMOD (1<<20)/* chmod-tweak matching files */
+#define MATCHFLG_FORCE_OWNER (1<<21)/* force owner of matching files */
+#define MATCHFLG_FORCE_GROUP (1<<22)/* force group of matching files */
-#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)
+#define MATCHFLGS_ATTRS (MATCHFLG_CHMOD | MATCHFLG_FORCE_OWNER | MATCHFLG_FORCE_GROUP)
+
+struct filter_chmod_struct {
+ unsigned int ref_cnt;
+ char *modestr;
+ struct chmod_mode_struct *modes;
+};
struct filter_struct {
struct filter_struct *next;
char *pattern;
- uint32 match_flags;
+ uint32 flags;
union {
int slash_cnt;
struct filter_list_struct *mergelist;
} u;
+ /* TODO: Use an "extras" mechanism to avoid
+ * allocating this memory when we don't need it. */
+ struct filter_chmod_struct *chmod;
+ uid_t force_uid;
+ gid_t force_gid;
};
struct filter_list_struct {
int xferred_files;
};
-struct chmod_mode_struct;
-
struct flist_ndx_item {
struct flist_ndx_item *next;
int ndx;