#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"
/* 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 */
#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
* 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
#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 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 XFLG_DIRECTORY (1<<4)
-#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
+#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_RECURSE (1<<1) /* recurse even w/o --force */
+#define DEL_TERSE (1<<2)
+
/* Log-message categories. FLOG is only used on the daemon side to
* output messages to the log file. */
/* 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"
# endif
#endif
+#if MAJOR_IN_MKDEV
+#include <sys/mkdev.h>
+# if !defined(makedev) && defined(mkdev)
+# define makedev mkdev
+# endif
+#elif MAJOR_IN_SYSMACROS
+#include <sys/sysmacros.h>
+#endif
+
#ifdef HAVE_COMPAT_H
#include <compat.h>
#endif
#include <assert.h>
+#include "lib/pool_alloc.h"
#define BOOL int
#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
* 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))
#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
#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 {
+ struct file_struct **files;
+ alloc_pool_t file_pool;
+ alloc_pool_t hlink_pool;
int count;
int malloced;
- 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 */
+ 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 */
+#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;
#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
#define STDERR_FILENO 2
#endif
+#ifndef S_IRUSR
+#define S_IRUSR 0400
+#endif
+
#ifndef S_IWUSR
#define S_IWUSR 0200
#endif
#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;
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff