X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/158595849728f923445b7f3920e9d2776ac116f8..18e1289f27838da70e7c93b0db98e41a29f09657:/rsync.h diff --git a/rsync.h b/rsync.h index 49034ac5..1766394d 100644 --- a/rsync.h +++ b/rsync.h @@ -58,10 +58,12 @@ /* These flags are used in the live flist data. */ #define FLAG_TOP_DIR (1<<0) -#define FLAG_HLINK_EOL (1<<1) /* generator only */ -#define FLAG_MOUNT_POINT (1<<2) /* sender only */ -#define FLAG_NO_FUZZY (1<<2) /* generator only */ +#define FLAG_HLINK_EOL (1<<1) /* receiver/generator */ +#define FLAG_MOUNT_POINT (1<<2) /* sender */ +#define FLAG_NO_FUZZY (1<<2) /* generator */ #define FLAG_DEL_HERE (1<<3) /* receiver/generator */ +#define FLAG_SENT (1<<3) /* sender */ +#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 29 @@ -98,10 +100,11 @@ #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) +#define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 - #define MAX_BASIS_DIRS 20 +#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100) #define MPLEX_BASE 7 @@ -112,6 +115,7 @@ #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 PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -130,24 +134,42 @@ #define FNAMECMP_BACKUP 0x82 #define FNAMECMP_FUZZY 0x83 -/* For calling delete_file() */ -#define DEL_DIR (1<<0) -#define DEL_NO_RECURSE (1<<1) -#define DEL_FORCE_RECURSE (1<<2) /* recurse even w/o --force */ -#define DEL_TERSE (1<<3) - - -/* Log-message categories. FLOG is only used on the daemon side to - * output messages to the log file. */ -enum logcode { FERROR=1, FINFO=2, FLOG=3 }; +/* For use by the itemize_changes code */ +#define ITEM_REPORT_CHECKSUM (1<<1) +#define ITEM_REPORT_SIZE (1<<2) +#define ITEM_REPORT_TIME (1<<3) +#define ITEM_REPORT_PERMS (1<<4) +#define ITEM_REPORT_OWNER (1<<5) +#define ITEM_REPORT_GROUP (1<<6) +#define ITEM_REPORT_XATTRS (1<<7) +#define ITEM_BASIS_TYPE_FOLLOWS (1<<11) +#define ITEM_XNAME_FOLLOWS (1<<12) +#define ITEM_IS_NEW (1<<13) +#define ITEM_LOCAL_CHANGE (1<<14) +#define ITEM_TRANSFER (1<<15) +/* These are outside the range of the transmitted flags. */ +#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */ +#define ITEM_DELETED (1<<17) /* used by log_formatted() */ + +#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. + * FLOG and FCLIENT are only used on the daemon side for custom logging, + * while FNAME is only used on the client side. */ +enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FNAME=5 }; /* Messages types that are sent over the message channel. The logcode * values must all be present here with identical numbers. */ enum msgcode { - MSG_DONE=5, /* current phase is done */ - MSG_REDO=4, /* reprocess indicated flist index */ - MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ - MSG_DATA=0 /* raw data on the multiplexed stream */ + MSG_DATA=0, /* raw data on the multiplexed stream */ + MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ + MSG_LOG=FLOG, /* sibling logging */ + MSG_REDO=9, /* reprocess indicated flist index */ + MSG_SUCCESS=100,/* successfully updated indicated flist index */ + MSG_DELETED=101,/* successfully deleted a file on receiving side */ + MSG_DONE=86 /* current phase is done */ }; #include "errcode.h" @@ -282,7 +304,7 @@ enum msgcode { #ifdef MAJOR_IN_MKDEV #include -# if !defined makedev && defined mkdev +# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__) # define makedev mkdev # endif #elif defined MAJOR_IN_SYSMACROS @@ -293,6 +315,10 @@ enum msgcode { #include #endif +#ifdef HAVE_LIMITS_H +# include +#endif + #include #include "lib/pool_alloc.h" @@ -437,6 +463,14 @@ struct idev { #define MAXPATHLEN 1024 #endif +/* We want a roomy line buffer that can hold more than MAXPATHLEN, + * and significantly more than an overly short MAXPATHLEN. */ +#if MAXPATHLEN < 4096 +#define BIGPATHBUFLEN (4096+1024) +#else +#define BIGPATHBUFLEN (MAXPATHLEN+1024) +#endif + #ifndef NAME_MAX #define NAME_MAX 255 #endif @@ -455,7 +489,7 @@ struct idev { #define HL_SKIP 1 struct hlink { - struct file_struct *next; + int next; int hlindex; }; @@ -553,11 +587,11 @@ struct map_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_ABS_PATH (1<<3) /* path-match on absolute path */ -#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */ -#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */ -#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */ +#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 */ @@ -569,6 +603,7 @@ struct map_struct { #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 MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \ | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \ @@ -648,8 +683,12 @@ extern char *sys_errlist[]; extern int errno; #endif -#define SUPPORT_LINKS HAVE_READLINK -#define SUPPORT_HARD_LINKS HAVE_LINK +#ifdef HAVE_READLINK +#define SUPPORT_LINKS 1 +#endif +#ifdef HAVE_LINK +#define SUPPORT_HARD_LINKS 1 +#endif #define SIGNAL_CAST (RETSIGTYPE (*)()) @@ -756,9 +795,9 @@ extern int errno; #define INITACCESSPERMS 0700 /* handler for null strings in printf format */ -#define NS(s) ((s)?safe_fname(s):"") +#define NS(s) ((s)?(s):"") -#if !defined __GNUC__ || defined APPLE +#if !defined __GNUC__ || defined __APPLE__ /* Apparently the OS X port of gcc gags on __attribute__. * * */