X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7b46e30fd49d49d2c775dff8fe0c12c41ebe2f0f..57edc4808f566fbaa58ec96bc7e543b1ccb92ab9:/rsync.h diff --git a/rsync.h b/rsync.h index 4a27ec0b..2366f576 100644 --- a/rsync.h +++ b/rsync.h @@ -2,7 +2,7 @@ * Copyright (C) 1996, 2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,6 +32,9 @@ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" +#define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ +#define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -50,46 +53,57 @@ #define XMIT_LONG_NAME (1<<6) #define XMIT_SAME_TIME (1<<7) #define XMIT_SAME_RDEV_MAJOR (1<<8) /* protocols 28 - now (devices only) */ -#define XMIT_NON_XFER_DIR (1<<8) /* protocols 30 - now (dirs only) */ +#define XMIT_NO_CONTENT_DIR (1<<8) /* protocols 30 - now (dirs only) */ #define XMIT_HLINKED (1<<9) /* protocols 28 - now */ #define XMIT_SAME_DEV_pre30 (1<<10) /* protocols 28 - 29 */ #define XMIT_USER_NAME_FOLLOWS (1<<10) /* protocols 30 - now */ #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) */ +#define XMIT_MOD_NSEC (1<<13) /* protocols 31 - now */ /* These flags are used in the live flist data. */ #define FLAG_TOP_DIR (1<<0) /* sender/receiver/generator */ +#define FLAG_OWNED_BY_US (1<<0) /* generator: set by make_file() for aux flists only */ #define FLAG_FILE_SENT (1<<1) /* sender/receiver/generator */ -#define FLAG_DIR_CHANGED (1<<1) /* generator */ -#define FLAG_XFER_DIR (1<<2) /* sender/receiver/generator */ -#define FLAG_MOUNT_DIR (1<<3) /* sender/generator */ +#define FLAG_DIR_CREATED (1<<1) /* generator */ +#define FLAG_CONTENT_DIR (1<<2) /* sender/receiver/generator */ +#define FLAG_MOUNT_DIR (1<<3) /* sender/generator (dirs only) */ +#define FLAG_SKIP_HLINK (1<<3) /* receiver/generator (w/FLAG_HLINKED) */ #define FLAG_DUPLICATE (1<<4) /* sender */ #define FLAG_MISSING_DIR (1<<4) /* generator */ -#define FLAG_HLINKED (1<<5) /* receiver/generator */ -#define FLAG_HLINK_FIRST (1<<6) /* receiver/generator */ +#define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */ +#define FLAG_HLINK_FIRST (1<<6) /* receiver/generator (w/FLAG_HLINKED) */ +#define FLAG_IMPLIED_DIR (1<<6) /* sender/receiver/generator (dirs only) */ #define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ -#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */ +#define FLAG_HLINK_DONE (1<<8) /* receiver/generator (checked on all types) */ #define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */ #define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */ +#define FLAG_TIME_FAILED (1<<11)/* generator */ +#define FLAG_MOD_NSEC (1<<12) /* sender/receiver/generator */ /* These flags are passed to functions but not stored. */ -#define FLAG_DIVERT_DIRS (1<<16)/* sender */ +#define FLAG_DIVERT_DIRS (1<<16) /* sender, but must be unique */ + +/* These flags are for get_dirlist(). */ +#define GDL_IGNORE_FILTER_RULES (1<<0) +/* Some helper macros for matching bits. */ #define BITS_SET(val,bits) (((val) & (bits)) == (bits)) #define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits)) #define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \ == ((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 7 + * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */ +#define SUBPROTOCOL_VERSION 12 /* 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 @@ -112,7 +126,8 @@ #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 @@ -120,8 +135,13 @@ #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) #define MAX_MAP_SIZE (256*1024) -#define IO_BUFFER_SIZE (4092) -#define MAX_BLOCK_SIZE ((int32)1 << 29) +#define IO_BUFFER_SIZE (32*1024) +#define MAX_BLOCK_SIZE ((int32)1 << 17) + +/* For compatibility with older rsyncs */ +#define OLD_MAX_BLOCK_SIZE ((int32)1 << 29) + +#define ROUND_UP_1024(siz) ((siz) & (1024-1) ? ((siz) | (1024-1)) + 1 : (siz)) #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) @@ -139,8 +159,9 @@ #define XFLG_FATAL_ERRORS (1<<0) #define XFLG_OLD_PREFIXES (1<<1) -#define XFLG_ANCHORED2ABS (1<<2) -#define XFLG_ABS_IF_SLASH (1<<3) +#define XFLG_ANCHORED2ABS (1<<2) /* leading slash indicates absolute */ +#define XFLG_ABS_IF_SLASH (1<<3) /* leading or interior slash is absolute */ +#define XFLG_DIR2WILD3 (1<<4) /* dir/ match gets trailing *** added */ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -161,8 +182,9 @@ /* For use by the itemize_changes code */ #define ITEM_REPORT_ATIME (1<<0) -#define ITEM_REPORT_CHECKSUM (1<<1) -#define ITEM_REPORT_SIZE (1<<2) +#define ITEM_REPORT_CHANGE (1<<1) +#define ITEM_REPORT_SIZE (1<<2) /* regular files only */ +#define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */ #define ITEM_REPORT_TIME (1<<3) #define ITEM_REPORT_PERMS (1<<4) #define ITEM_REPORT_OWNER (1<<5) @@ -182,33 +204,78 @@ #define SIGNIFICANT_ITEM_FLAGS (~(\ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) - -/* Log-message categories. Only FERROR and FINFO get sent over the socket, - * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe. - * FLOG only goes to the log file, not the client; FCLIENT is the opposite. */ -enum logcode { FNONE=0, FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 }; +#define CFN_KEEP_DOT_DIRS (1<<0) +#define CFN_KEEP_TRAILING_SLASH (1<<1) +#define CFN_DROP_TRAILING_DOT_DIR (1<<2) +#define CFN_COLLAPSE_DOT_DOT_DIRS (1<<3) + +#define SP_DEFAULT 0 +#define SP_KEEP_DOT_DIRS (1<<0) + +#define CD_NORMAL 0 +#define CD_SKIP_CHDIR 1 + +/* Log-message categories. FLOG only goes to the log file, not the client; + * FCLIENT is the opposite. */ +enum logcode { + FNONE=0, /* never sent */ + FERROR_XFER=1, FINFO=2, /* sent over socket for any protocol */ + FERROR=3, FWARNING=4, /* sent over socket for protocols >= 30 */ + FERROR_SOCKET=5, FLOG=6, /* only sent via receiver -> generator pipe */ + FERROR_UTF8=8, /* only sent via receiver -> generator pipe */ + FCLIENT=7 /* never transmitted (e.g. server converts to FINFO) */ +}; /* Messages types that are sent over the message channel. The logcode * values must all be present here with identical numbers. */ enum msgcode { MSG_DATA=0, /* raw data on the multiplexed stream */ - MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ - MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */ + MSG_ERROR_XFER=FERROR_XFER, MSG_INFO=FINFO, /* remote logging */ + MSG_ERROR=FERROR, MSG_WARNING=FWARNING, /* protocol-30 remote logging */ + MSG_ERROR_SOCKET=FERROR_SOCKET, /* sibling logging */ + MSG_ERROR_UTF8=FERROR_UTF8, /* sibling logging */ + MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, /* sibling logging */ MSG_REDO=9, /* reprocess indicated flist index */ - MSG_FLIST=20, /* extra file list over sibling socket */ - MSG_FLIST_EOF=21,/* we've transmitted all the file lists */ + MSG_STATS=10, /* message has stats data for generator */ MSG_IO_ERROR=22,/* the sending side had an I/O error */ - MSG_NOOP=42, /* a do-nothing message */ + MSG_IO_TIMEOUT=33,/* tell client about a daemon's timeout value */ + MSG_NOOP=42, /* a do-nothing message (legacy protocol-30 only) */ + MSG_ERROR_EXIT=86, /* synchronize an error exit (siblings and protocol >= 31) */ MSG_SUCCESS=100,/* successfully updated indicated flist index */ MSG_DELETED=101,/* successfully deleted a file on receiving side */ MSG_NO_SEND=102,/* sender failed to open a file we wanted */ - MSG_DONE=86 /* current phase is done */ }; #define NDX_DONE -1 #define NDX_FLIST_EOF -2 +#define NDX_DEL_STATS -3 #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 */ + +/* Defines for maybe_send_keepalive() */ +#define MSK_ALLOW_FLUSH (1<<0) +#define MSK_ACTIVE_RECEIVER (1<<1) + #include "errcode.h" #include "config.h" @@ -242,6 +309,9 @@ enum msgcode { #ifdef HAVE_INTTYPES_H # include #endif +#ifdef HAVE_STDINT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif @@ -301,6 +371,18 @@ enum msgcode { #include #endif +#if defined HAVE_UTIMENSAT || defined HAVE_LUTIMES +#define CAN_SET_SYMLINK_TIMES 1 +#endif + +#if defined HAVE_LCHOWN || defined CHOWN_MODIFIES_SYMLINK +#define CAN_CHOWN_SYMLINK 1 +#endif + +#if defined HAVE_LCHMOD || defined HAVE_SETATTRLIST +#define CAN_CHMOD_SYMLINK 1 +#endif + #ifdef HAVE_SYS_SELECT_H #include #endif @@ -312,10 +394,6 @@ enum msgcode { #endif #endif -#ifdef HAVE_GLOB_H -#include -#endif - /* these are needed for the uid/gid mapping code */ #include #include @@ -323,7 +401,9 @@ enum msgcode { #include #include #include +#ifdef HAVE_NETDB_H #include +#endif #include #include @@ -365,19 +445,46 @@ enum msgcode { # include #endif -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#if defined USE_ICONV_OPEN && defined HAVE_ICONV_H #include #ifndef ICONV_CONST #define ICONV_CONST #endif -#elif defined ICONV_CONST +#else +#ifdef ICONV_CONST #undef ICONV_CONST #endif +#ifdef ICONV_OPTION +#undef ICONV_OPTION +#endif +#ifdef iconv_t +#undef iconv_t +#endif +#define iconv_t int +#endif #include #include "lib/pool_alloc.h" +#ifndef HAVE_ID_T +typedef unsigned int id_t; +#endif +#ifndef HAVE_PID_T +typedef int pid_t; +#endif +#ifndef HAVE_MODE_T +typedef unsigned int mode_t; +#endif +#ifndef HAVE_OFF_T +typedef long off_t; +#undef SIZEOF_OFF_T +#define SIZEOF_OFF_T SIZEOF_LONG +#endif +#ifndef HAVE_SIZE_T +typedef unsigned int size_t; +#endif + #define BOOL int #ifndef uchar @@ -446,10 +553,12 @@ enum msgcode { #if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !defined HAVE_STRUCT_STAT64 #define OFF_T off_t #define STRUCT_STAT struct stat +#define SIZEOF_CAPITAL_OFF_T SIZEOF_OFF_T #else #define OFF_T off64_t #define STRUCT_STAT struct stat64 #define USE_STAT64_FUNCS 1 +#define SIZEOF_CAPITAL_OFF_T SIZEOF_OFF64_T #endif /* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF @@ -495,6 +604,7 @@ struct hashtable { void *nodes; int32 size, entries; uint32 node_size; + short key64; }; struct ht_int32_node { @@ -578,7 +688,7 @@ extern int xattrs_ndx; #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) #define EXTRA_LEN (sizeof (union file_extras)) -#define PTR_EXTRA_LEN ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN) +#define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN) #define DEV_EXTRA_CNT 2 #define DIRNODE_EXTRA_CNT 3 #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN) @@ -586,7 +696,9 @@ extern int xattrs_ndx; #define REQ_EXTRA(f,ndx) ((union file_extras*)(f) - (ndx)) #define OPT_EXTRA(f,bump) ((union file_extras*)(f) - file_extra_cnt - 1 - (bump)) +#define NSEC_BUMP(f) ((f)->flags & FLAG_MOD_NSEC ? 1 : 0) #define LEN64_BUMP(f) ((f)->flags & FLAG_LENGTH64 ? 1 : 0) +#define START_BUMP(f) (NSEC_BUMP(f) + LEN64_BUMP(f)) #define HLINK_BUMP(f) ((f)->flags & (FLAG_HLINKED|FLAG_HLINK_DONE) ? inc_recurse+1 : 0) #define ACL_BUMP(f) (acls_ndx ? 1 : 0) @@ -595,14 +707,16 @@ extern int xattrs_ndx; #define F_LENGTH(f) ((int64)(f)->len32) #else #define F_LENGTH(f) ((int64)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \ - ? (int64)OPT_EXTRA(f, 0)->unum << 32 : 0)) + ? (int64)OPT_EXTRA(f, NSEC_BUMP(f))->unum << 32 : 0)) #endif +#define F_MOD_NSEC(f) ((f)->flags & FLAG_MOD_NSEC ? OPT_EXTRA(f, 0)->unum : 0) + /* If there is a symlink string, it is always right after the basename */ #define F_SYMLINK(f) ((f)->basename + strlen((f)->basename) + 1) /* The sending side always has this available: */ -#define F_PATHNAME(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN)) +#define F_PATHNAME(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_CNT)) /* The receiving side always has this available: */ #define F_DEPTH(f) REQ_EXTRA(f, 1)->num @@ -612,23 +726,24 @@ extern int xattrs_ndx; #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num -#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num +#define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num /* These items are per-entry optional: */ -#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num /* non-dirs */ -#define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f)+inc_recurse)->num /* non-dirs */ -#define F_DIR_NODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) \ +#define F_HL_GNUM(f) OPT_EXTRA(f, START_BUMP(f))->num /* non-dirs */ +#define F_HL_PREV(f) OPT_EXTRA(f, START_BUMP(f)+inc_recurse)->num /* non-dirs */ +#define F_DIR_NODE_P(f) (&OPT_EXTRA(f, START_BUMP(f) \ + DIRNODE_EXTRA_CNT - 1)->num) /* sender dirs */ -#define F_DIR_DEFACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum /* receiver dirs */ -#define F_DIR_DEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + ACL_BUMP(f) \ +#define F_DIR_RELNAMES_P(f) (&OPT_EXTRA(f, START_BUMP(f) + DIRNODE_EXTRA_CNT \ + + PTR_EXTRA_CNT - 1)->num) /* sender dirs */ +#define F_DIR_DEFACL(f) OPT_EXTRA(f, START_BUMP(f))->unum /* receiver dirs */ +#define F_DIR_DEV_P(f) (&OPT_EXTRA(f, START_BUMP(f) + ACL_BUMP(f) \ + DEV_EXTRA_CNT - 1)->unum) /* receiver dirs */ -/* This optional item might follow an F_HL_*() item. - * (Note: a device doesn't need to check LEN64_BUMP(f).) */ -#define F_RDEV_P(f) (&OPT_EXTRA(f, HLINK_BUMP(f) + 2 - 1)->unum) +/* This optional item might follow an F_HL_*() item. */ +#define F_RDEV_P(f) (&OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) + DEV_EXTRA_CNT - 1)->unum) /* The sum is only present on regular files. */ -#define F_SUM(f) ((char*)OPT_EXTRA(f, LEN64_BUMP(f) + HLINK_BUMP(f) \ +#define F_SUM(f) ((char*)OPT_EXTRA(f, START_BUMP(f) + HLINK_BUMP(f) \ + SUM_EXTRA_CNT - 1)) /* Some utility defines: */ @@ -638,9 +753,11 @@ extern int xattrs_ndx; #define F_HLINK_NOT_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST) #define F_HLINK_NOT_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST) +/* These access the F_DIR_DEV_P() and F_RDEV_P() values: */ #define DEV_MAJOR(a) (a)[0] #define DEV_MINOR(a) (a)[1] +/* These access the F_DIRS_NODE_P() values: */ #define DIR_PARENT(a) (a)[0] #define DIR_FIRST_CHILD(a) (a)[1] #define DIR_NEXT_SIBLING(a) (a)[2] @@ -674,7 +791,7 @@ struct file_list { int used, malloced; int low, high; /* 0-relative index values excluding empties */ int ndx_start; /* the start offset for inc_recurse mode */ - int ndx_end; /* the end offset for inc_recurse mode */ + int flist_num; /* 1-relative file_list number or 0 */ int parent_ndx; /* dir_flist index of parent directory */ int in_progress, to_redo; }; @@ -711,47 +828,45 @@ struct map_struct { 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; @@ -763,13 +878,23 @@ struct stats { int64 flist_buildtime; int64 flist_xfertime; int64 flist_size; - int num_files; - int num_transferred_files; - int current_file_index; + 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 { @@ -781,6 +906,42 @@ typedef struct { #define EXPAND_ITEM_LIST(lp, type, incr) \ (type*)expand_item_list(lp, sizeof (type), #type, incr) +#define EMPTY_XBUF {NULL, 0, 0, 0} + +typedef struct { + char *buf; + size_t pos; /* pos = read pos in the buf */ + size_t len; /* len = chars following pos */ + size_t size; /* size = total space in buf */ +} xbuf; + +#define INIT_XBUF(xb, str, ln, sz) (xb).buf = (str), (xb).len = (ln), (xb).size = (sz), (xb).pos = 0 +#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (size_t)-1, (xb).pos = 0 +/* This one is used to make an output xbuf based on a char[] buffer: */ +#define INIT_CONST_XBUF(xb, bf) (xb).buf = (bf), (xb).size = sizeof (bf), (xb).len = (xb).pos = 0 + +#define ICB_EXPAND_OUT (1<<0) +#define ICB_INCLUDE_BAD (1<<1) +#define ICB_INCLUDE_INCOMPLETE (1<<2) +#define ICB_CIRCULAR_OUT (1<<3) +#define ICB_INIT (1<<4) + +#define IOBUF_KEEP_BUFS 0 +#define IOBUF_FREE_BUFS 1 + +#define MPLX_SWITCHING IOBUF_KEEP_BUFS +#define MPLX_ALL_DONE IOBUF_FREE_BUFS +#define MPLX_TO_BUFFERED 2 + +#define RL_EOL_NULLS (1<<0) +#define RL_DUMP_COMMENTS (1<<1) +#define RL_CONVERT (1<<2) + +typedef struct { + char name_type; + char fname[1]; /* has variable size */ +} relnamecache; + #include "byteorder.h" #include "lib/mdigest.h" #include "lib/wildmatch.h" @@ -809,7 +970,7 @@ typedef struct { #ifdef SUPPORT_XATTRS item_list *xattr; #endif -} statx; +} stat_x; #define ACL_READY(sx) ((sx).acc_acl != NULL) #define XATTR_READY(sx) ((sx).xattr != NULL) @@ -858,6 +1019,9 @@ extern int errno; #ifdef HAVE_READLINK #define SUPPORT_LINKS 1 +#ifndef NO_SYMLINK_XATTRS +#define do_readlink(path, buf, bufsiz) readlink(path, buf, bufsiz) +#endif #endif #ifdef HAVE_LINK #define SUPPORT_HARD_LINKS 1 @@ -968,6 +1132,10 @@ extern int errno; #define IS_SPECIAL(mode) (S_ISSOCK(mode) || S_ISFIFO(mode)) #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) +#define PRESERVE_FILE_TIMES (1<<0) +#define PRESERVE_DIR_TIMES (1<<1) +#define PRESERVE_LINK_TIMES (1<<2) + /* Initial mask on permissions given to temporary files. Mask off setuid bits and group access because of potential race-condition security holes, and mask other access because mode 707 is bizarre */ @@ -1028,7 +1196,58 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define MY_GID() getgid() #endif -extern int verbose; +#ifdef FORCE_FD_ZERO_MEMSET +#undef FD_ZERO +#define FD_ZERO(fdsetp) memset(fdsetp, 0, sizeof (fd_set)) +#endif + +extern short info_levels[], debug_levels[]; + +#define INFO_GTE(flag, lvl) (info_levels[INFO_##flag] >= (lvl)) +#define INFO_EQ(flag, lvl) (info_levels[INFO_##flag] == (lvl)) +#define DEBUG_GTE(flag, lvl) (debug_levels[DEBUG_##flag] >= (lvl)) +#define DEBUG_EQ(flag, lvl) (debug_levels[DEBUG_##flag] == (lvl)) + +#define INFO_BACKUP 0 +#define INFO_COPY (INFO_BACKUP+1) +#define INFO_DEL (INFO_COPY+1) +#define INFO_FLIST (INFO_DEL+1) +#define INFO_MISC (INFO_FLIST+1) +#define INFO_MOUNT (INFO_MISC+1) +#define INFO_NAME (INFO_MOUNT+1) +#define INFO_PROGRESS (INFO_NAME+1) +#define INFO_REMOVE (INFO_PROGRESS+1) +#define INFO_SKIP (INFO_REMOVE+1) +#define INFO_STATS (INFO_SKIP+1) +#define INFO_SYMSAFE (INFO_STATS+1) + +#define COUNT_INFO (INFO_SYMSAFE+1) + +#define DEBUG_ACL 0 +#define DEBUG_BACKUP (DEBUG_ACL+1) +#define DEBUG_BIND (DEBUG_BACKUP+1) +#define DEBUG_CHDIR (DEBUG_BIND+1) +#define DEBUG_CONNECT (DEBUG_CHDIR+1) +#define DEBUG_CMD (DEBUG_CONNECT+1) +#define DEBUG_DEL (DEBUG_CMD+1) +#define DEBUG_DELTASUM (DEBUG_DEL+1) +#define DEBUG_DUP (DEBUG_DELTASUM+1) +#define DEBUG_EXIT (DEBUG_DUP+1) +#define DEBUG_FILTER (DEBUG_EXIT+1) +#define DEBUG_FLIST (DEBUG_FILTER+1) +#define DEBUG_FUZZY (DEBUG_FLIST+1) +#define DEBUG_GENR (DEBUG_FUZZY+1) +#define DEBUG_HASH (DEBUG_GENR+1) +#define DEBUG_HLINK (DEBUG_HASH+1) +#define DEBUG_ICONV (DEBUG_HLINK+1) +#define DEBUG_IO (DEBUG_ICONV+1) +#define DEBUG_OWN (DEBUG_IO+1) +#define DEBUG_PROTO (DEBUG_OWN+1) +#define DEBUG_RECV (DEBUG_PROTO+1) +#define DEBUG_SEND (DEBUG_RECV+1) +#define DEBUG_TIME (DEBUG_SEND+1) + +#define COUNT_DEBUG (DEBUG_TIME+1) #ifndef HAVE_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); @@ -1041,65 +1260,3 @@ int inet_pton(int af, const char *src, void *dst); #ifdef MAINTAINER_MODE const char *get_panic_action(void); #endif - -static inline int to_wire_mode(mode_t mode) -{ -#ifdef SUPPORT_LINKS -#if _S_IFLNK != 0120000 - if (S_ISLNK(mode)) - return (mode & ~(_S_IFMT)) | 0120000; -#endif -#endif - return mode; -} - -static inline mode_t from_wire_mode(int mode) -{ -#if _S_IFLNK != 0120000 - if ((mode & (_S_IFMT)) == 0120000) - return (mode & ~(_S_IFMT)) | _S_IFLNK; -#endif - return mode; -} - -static inline int -isDigit(const char *ptr) -{ - return isdigit(*(unsigned char *)ptr); -} - -static inline int -isPrint(const char *ptr) -{ - return isprint(*(unsigned char *)ptr); -} - -static inline int -isSpace(const char *ptr) -{ - return isspace(*(unsigned char *)ptr); -} - -static inline int -isLower(const char *ptr) -{ - return islower(*(unsigned char *)ptr); -} - -static inline int -isUpper(const char *ptr) -{ - return isupper(*(unsigned char *)ptr); -} - -static inline int -toLower(const char *ptr) -{ - return tolower(*(unsigned char *)ptr); -} - -static inline int -toUpper(const char *ptr) -{ - return toupper(*(unsigned char *)ptr); -}