X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0596df00b3dc0ad31365514ab55ab191e27a3ad4..e32db5c9aade691a13a200e867a812099bfdcdae:/rsync.h diff --git a/rsync.h b/rsync.h index d37243ac..88a503f6 100644 --- a/rsync.h +++ b/rsync.h @@ -27,7 +27,7 @@ #define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO" #define RSYNC_NAME "rsync" -#define RSYNCD_SYSCONF "/etc/rsyncd.conf" +/* RSYNCD_SYSCONF is now set in config.h */ #define RSYNCD_USERCONF "rsyncd.conf" #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" @@ -41,7 +41,7 @@ /* These flags are only used during the flist transfer. */ -#define XMIT_TOP_DIR (1<<0) +#define XMIT_DEL_START (1<<0) #define XMIT_SAME_MODE (1<<1) #define XMIT_EXTENDED_FLAGS (1<<2) #define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */ @@ -50,18 +50,19 @@ #define XMIT_SAME_NAME (1<<5) #define XMIT_LONG_NAME (1<<6) #define XMIT_SAME_TIME (1<<7) -#define XMIT_SAME_HIGH_RDEV (1<<8) +#define XMIT_SAME_RDEV_MAJOR (1<<8) #define XMIT_HAS_IDEV_DATA (1<<9) #define XMIT_SAME_DEV (1<<10) +#define XMIT_RDEV_MINOR_IS_SMALL (1<<11) /* These flags are used in the live flist data. */ -#define FLAG_TOP_DIR (1<<0) +#define FLAG_DEL_START (1<<0) #define FLAG_HLINK_EOL (1<<1) /* generator only */ #define FLAG_MOUNT_POINT (1<<2) /* sender only */ /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 28 +#define PROTOCOL_VERSION 29 /* 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 @@ -91,27 +92,51 @@ #define CHUNK_SIZE (32*1024) #define MAX_MAP_SIZE (256*1024) #define IO_BUFFER_SIZE (4092) +#define MAX_BLOCK_SIZE ((int32)1 << 29) #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) #define MAX_ARGS 1000 +#define MAX_BASIS_DIRS 20 + #define MPLEX_BASE 7 -#define NO_EXCLUDES 0 -#define SERVER_EXCLUDES 1 -#define ALL_EXCLUDES 2 +#define NO_FILTERS 0 +#define SERVER_FILTERS 1 +#define ALL_FILTERS 2 -#define MISSING_OK 0 -#define MISSING_FATAL 1 +#define XFLG_FATAL_ERRORS (1<<0) +#define XFLG_DEF_INCLUDE (1<<1) +#define XFLG_DEF_EXCLUDE (1<<2) +#define XFLG_WORD_SPLIT (1<<3) +#define XFLG_DIRECTORY (1<<4) +#define XFLG_NO_PREFIXES (1<<5) +#define XFLG_ABS_PATH (1<<6) -#define ADD_INCLUDE 1 -#define ADD_EXCLUDE 0 +#define PERMS_REPORT (1<<0) +#define PERMS_SKIP_MTIME (1<<1) #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 +#define PDIR_CREATE 1 +#define PDIR_DELETE 0 + +/* Note: 0x00 - 0x7F are used for basis_dir[] indexes! */ +#define FNAMECMP_BASIS_DIR_LOW 0x00 /* Must remain 0! */ +#define FNAMECMP_BASIS_DIR_HIGH 0x7F +#define FNAMECMP_FNAME 0x80 +#define FNAMECMP_PARTIAL_DIR 0x81 +#define FNAMECMP_BACKUP 0x82 + +/* 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. */ @@ -120,10 +145,10 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3 }; /* 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, MSG_LOG=FLOG, /* remote logging */ - MSG_REDO=4, /* reprocess indicated flist index */ 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 */ }; #include "errcode.h" @@ -246,6 +271,15 @@ enum msgcode { # endif #endif +#if MAJOR_IN_MKDEV +#include +# if !defined(makedev) && defined(mkdev) +# define makedev mkdev +# endif +#elif MAJOR_IN_SYSMACROS +#include +#endif + #ifdef HAVE_COMPAT_H #include #endif @@ -260,7 +294,7 @@ enum msgcode { #define uchar unsigned char #endif -#if HAVE_UNSIGNED_CHAR +#if SIGNED_CHAR_OK #define schar signed char #else #define schar char @@ -292,6 +326,12 @@ enum msgcode { #define STRUCT_STAT struct stat #endif +/* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF + * that's the maximum size the file system can handle and there is no + * 64-bit type available. The rsync source must therefore take steps + * to ensure that any code that really requires a 64-bit integer has + * it (e.g. the checksum code uses two 32-bit integers for its 64-bit + * counter). */ #if HAVE_OFF64_T #define int64 off64_t #elif (SIZEOF_LONG == 8) @@ -303,18 +343,7 @@ enum msgcode { #else /* As long as it gets... */ #define int64 off_t -#define NO_INT64 -#endif - -#if (SIZEOF_LONG == 8) -#define uint64 unsigned long -#elif (SIZEOF_INT == 8) -#define uint64 unsigned int -#elif HAVE_LONGLONG -#define uint64 unsigned long long -#else -/* As long as it gets... */ -#define uint64 unsigned off_t +#define INT64_IS_OFF_T #endif /* Starting from protocol version 26, we always use 64-bit @@ -339,17 +368,14 @@ enum msgcode { * device numbers will be truncated. But it's a kind of silly thing * to do anyhow. * - * FIXME: In future, we should probable split the device number into - * major/minor, and transfer the two parts as 32-bit ints. That gives - * you somewhat more of a chance that they'll come from a big machine - * to a little one in a useful way. - * - * FIXME: Really we need an unsigned type, and we perhaps ought to - * cope with platforms on which this is an unsigned int or even a - * struct. Later. + * FIXME: I don't think the code in flist.c has ever worked on a system + * where dev_t is a struct. */ -#define INO64_T uint64 -#define DEV64_T uint64 + +struct idev { + int64 inode; + int64 dev; +}; #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -385,19 +411,14 @@ enum msgcode { #define IN_LOOPBACKNET 127 #endif -#define GID_NONE (gid_t) -1 +#define GID_NONE ((gid_t)-1) #define HL_CHECK_MASTER 0 #define HL_SKIP 1 struct hlink { - int hlindex; struct file_struct *next; -}; - -struct idev { - INO64_T inode; - DEV64_T dev; + int hlindex; }; #define F_DEV link_u.idev->dev @@ -408,9 +429,9 @@ struct idev { struct file_struct { union { - DEV64_T rdev; /* The device number, if this is a device */ + dev_t rdev; /* The device number, if this is a device */ char *sum; /* Only a normal file can have a checksum */ - char *link; /* Holds symlink string, if a symlink */ + char *link; /* Points to symlink string, if a symlink */ } u; OFF_T length; char *basename; @@ -450,54 +471,72 @@ struct file_struct { #define WITHOUT_HLINK 0 struct file_list { - int count; - int malloced; + struct file_struct **files; alloc_pool_t file_pool; alloc_pool_t hlink_pool; - struct file_struct **files; + int count; + int malloced; }; +#define SUMFLG_SAME_OFFSET (1<<0) + struct sum_buf { OFF_T offset; /**< offset in file of this chunk */ - unsigned int len; /**< length of chunk of file */ - int i; /**< index of this chunk */ + int32 len; /**< length of chunk of file */ uint32 sum1; /**< simple checksum */ + short flags; /**< flag bits */ char sum2[SUM_LENGTH]; /**< checksum */ }; struct sum_struct { OFF_T flength; /**< total file length */ + struct sum_buf *sums; /**< points to info for each chunk */ size_t count; /**< how many chunks */ - unsigned int blength; /**< block_length */ - unsigned int remainder; /**< flength % block_length */ + int32 blength; /**< block_length */ + int32 remainder; /**< flength % block_length */ int s2length; /**< sum2_length */ - struct sum_buf *sums; /**< points to info for each chunk */ }; struct map_struct { - char *p; /* Window pointer */ - int fd; /* File Descriptor */ - int p_size; /* Window size at allocation */ - int p_len; /* Window size after fill */ - /* p_size and p_len could be - * consolodated by using a local - * variable in map_ptr() */ - int status; /* first errno from read errors */ OFF_T file_size; /* File size (from stat) */ OFF_T p_offset; /* Window start */ OFF_T p_fd_offset; /* offset of cursor in fd ala lseek */ + char *p; /* Window pointer */ + int32 p_size; /* Largest window size we allocated */ + int32 p_len; /* Latest (rounded) window size */ + int32 def_window_size; /* Default window size */ + int fd; /* File Descriptor */ + 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_ABS_PATH (1<<3) /* path-match on absolute path */ -struct exclude_struct { +#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_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 */ +struct filter_struct { + struct filter_struct *next; char *pattern; - int match_flags; - int include; - int directory; - int slash_cnt; + unsigned int match_flags; + union { + int slash_cnt; + struct filter_list_struct *mergelist; + } u; +}; + +struct filter_list_struct { + struct filter_struct *head; + struct filter_struct *tail; + char *debug_type; }; struct stats { @@ -507,6 +546,8 @@ struct stats { int64 total_read; int64 literal_data; int64 matched_data; + int64 flist_buildtime; + int64 flist_xfertime; int flist_size; int num_files; int num_transferred_files; @@ -568,13 +609,6 @@ extern int errno; #define SUPPORT_LINKS HAVE_READLINK #define SUPPORT_HARD_LINKS HAVE_LINK -/* This could be bad on systems which have no lchown and where chown - * follows symbollic links. On such systems it might be better not to - * try to chown symlinks at all. */ -#ifndef HAVE_LCHOWN -#define lchown chown -#endif - #define SIGNAL_CAST (RETSIGTYPE (*)()) #ifndef EWOULDBLOCK @@ -593,6 +627,10 @@ extern int errno; #define STDERR_FILENO 2 #endif +#ifndef S_IRUSR +#define S_IRUSR 0400 +#endif + #ifndef S_IWUSR #define S_IWUSR 0200 #endif