X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/df0054ab13b7d045093d1e6ae44f369a45edb851..28deecca55ff109d6eff7fc09bac7843559b7d5c:/rsync.h diff --git a/rsync.h b/rsync.h index 1937c7c7..d5485079 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" @@ -50,9 +50,10 @@ #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. */ @@ -80,8 +81,8 @@ * unlikely to begin by sending a byte between MIN_PROTOCL_VERSION and * MAX_PROTOCOL_VERSION. */ -#define MIN_PROTOCOL_VERSION 19 -#define OLD_PROTOCOL_VERSION 20 +#define MIN_PROTOCOL_VERSION 20 +#define OLD_PROTOCOL_VERSION 25 #define MAX_PROTOCOL_VERSION 40 #define RSYNC_PORT 873 @@ -103,17 +104,17 @@ #define SERVER_EXCLUDES 1 #define ALL_EXCLUDES 2 -#define MISSING_OK 0 -#define MISSING_FATAL 1 +#define XFLG_FATAL_ERRORS (1<<0) +#define XFLG_DEF_INCLUDE (1<<1) +#define XFLG_WORDS_ONLY (1<<2) +#define XFLG_WORD_SPLIT (1<<3) -#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 CLEAR_STRUCT 0 -#define FREE_STRUCT 1 /* Log-message categories. FLOG is only used on the daemon side to * output messages to the log file. */ @@ -122,10 +123,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" @@ -248,12 +249,19 @@ enum msgcode { # endif #endif +#if MAJOR_IN_MKDEV +#include +#elif MAJOR_IN_SYSMACROS +#include +#endif + #ifdef HAVE_COMPAT_H #include #endif #include +#include "lib/pool_alloc.h" #define BOOL int @@ -304,7 +312,7 @@ enum msgcode { #else /* As long as it gets... */ #define int64 off_t -#define NO_INT64 +#define INT64_IS_OFF_T #endif #if (SIZEOF_LONG == 8) @@ -340,17 +348,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 { + uint64 inode; + uint64 dev; +}; #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -386,7 +391,7 @@ 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 @@ -396,11 +401,6 @@ struct hlink { struct file_struct *next; }; -struct idev { - INO64_T inode; - DEV64_T dev; -}; - #define F_DEV link_u.idev->dev #define F_INODE link_u.idev->inode @@ -408,47 +408,63 @@ struct idev { #define F_NEXT link_u.links->next struct file_struct { - time_t modtime; - OFF_T length; - mode_t mode; 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; + char *dirname; + char *basedir; union { struct idev *idev; struct hlink *links; } link_u; - char *basename; - char *dirname; - char *basedir; + time_t modtime; uid_t uid; gid_t gid; - uchar flags; + mode_t mode; + uchar flags; /* this item MUST remain last */ }; -#define ARENA_SIZE (32 * 1024) +/* + * Start the flist array at FLIST_START entries and grow it + * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR + */ +#define FLIST_START (32 * 1024) +#define FLIST_LINEAR (FLIST_START * 512) + +/* + * Extent size for allocation pools A minimum size of 128KB + * is needed to mmap them so that freeing will release the + * space to the OS. + * + * Larger sizes reduce leftover fragments and speed free calls + * (when they happen) Smaller sizes increase the chance of + * freed allocations freeing whole extents. + */ +#define FILE_EXTENT (256 * 1024) +#define HLINK_EXTENT (128 * 1024) -struct string_area { - char *base; - char *end; - char *current; - struct string_area *next; -}; +#define WITH_HLINK 1 +#define WITHOUT_HLINK 0 struct file_list { int count; int malloced; + alloc_pool_t file_pool; + alloc_pool_t hlink_pool; struct file_struct **files; - struct string_area *string_area; }; +#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 */ uint32 sum1; /**< simple checksum */ + short flags; /**< flag bits */ char sum2[SUM_LENGTH]; /**< checksum */ }; @@ -464,11 +480,9 @@ struct sum_struct { 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 p_size; /* Largest window size we allocated */ + int p_len; /* Latest (rounded) window size */ + int def_window_size; /* Default window size */ int status; /* first errno from read errors */ OFF_T file_size; /* File size (from stat) */ OFF_T p_offset; /* Window start */ @@ -479,14 +493,22 @@ struct map_struct { #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 */ struct exclude_struct { + struct exclude_struct *next; char *pattern; - int match_flags; - int include; - int directory; + unsigned int match_flags; int slash_cnt; }; +struct exclude_list_struct { + struct exclude_struct *head; + struct exclude_struct *tail; + char *debug_type; +}; + struct stats { int64 total_size; int64 total_transferred_size; @@ -580,6 +602,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 @@ -712,6 +738,17 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) +#ifdef HAVE_GETEUID +#define MY_UID() geteuid() +#else +#define MY_UID() getuid() +#endif + +#ifdef HAVE_GETEGID +#define MY_GID() getegid() +#else +#define MY_GID() getgid() +#endif extern int verbose;