#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
+#define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
#define RSYNC_NAME "rsync"
#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
#define FLAG_DELETE (1<<0)
#define SAME_MODE (1<<1)
-#define SAME_RDEV (1<<2)
+#define EXTENDED_FLAGS (1<<2)
+#define SAME_RDEV_pre28 EXTENDED_FLAGS /* Only use in protocols < 28 */
#define SAME_UID (1<<3)
#define SAME_GID (1<<4)
#define SAME_DIR (1<<5)
#define SAME_NAME SAME_DIR
#define LONG_NAME (1<<6)
#define SAME_TIME (1<<7)
+#define SAME_HIGH_RDEV (1<<8)
+#define HAS_INODE_DATA (1<<9)
+#define SAME_DEV (1<<10)
+
+/* What flags are relevant after the transfer of the flist is complete? */
+#define LIVE_FLAGS (FLAG_DELETE|HAS_INODE_DATA)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 27
+#define PROTOCOL_VERSION 28
/* 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 17
+#define MIN_PROTOCOL_VERSION 19
#define OLD_PROTOCOL_VERSION 20
#define MAX_PROTOCOL_VERSION 40
#define MAX_MAP_SIZE (256*1024)
#define IO_BUFFER_SIZE (4092)
+#define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */
+#define IOERR_VANISHED (1<<1)
+
#define MAX_ARGS 1000
#define MPLEX_BASE 7
#include "config.h"
-/* The default RSYNC_RSH is always set in config.h, either to "remsh",
- * "rsh", or otherwise something specified by the user. HAVE_REMSH
- * controls parameter munging for HP/UX, etc. */
+/* The default RSYNC_RSH is always set in config.h. */
#include <sys/types.h>
#include <stdlib.h>
#endif
+#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H))
+#include <malloc.h>
+#endif
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
#include <string.h>
#endif
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
#include <time.h>
#endif
#endif
-#ifdef HAVE_FNMATCH
-#include <fnmatch.h>
-#else
-#include "lib/fnmatch.h"
-#endif
-
#ifdef HAVE_GLOB_H
#include <glob.h>
#endif
-#ifdef HAVE_MALLOC_H
-# include <malloc.h>
-#endif
-
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
#define IN_LOOPBACKNET 127
#endif
-struct file_struct {
- unsigned flags;
- time_t modtime;
- OFF_T length;
- mode_t mode;
+#define GID_NONE (gid_t) -1
+
+struct hlink {
+ struct file_struct *head;
+ struct file_struct *next;
+};
+struct idev {
INO64_T inode;
- /** Device this file lives upon */
DEV64_T dev;
+};
- /** If this is a device node, the device number. */
- DEV64_T rdev;
- uid_t uid;
- gid_t gid;
+#define F_DEV link_u.idev->dev
+#define F_INODE link_u.idev->inode
+
+#define F_HEAD link_u.links->head
+#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 */
+ char *sum; /* Only a normal file can have a checksum */
+ char *link; /* Holds symlink string, if a symlink */
+ } u;
+ union {
+ struct idev *idev;
+ struct hlink *links;
+ } link_u;
char *basename;
char *dirname;
char *basedir;
- char *link;
- char *sum;
+ uid_t uid;
+ gid_t gid;
+ unsigned short flags;
};
-
#define ARENA_SIZE (32 * 1024)
struct string_area {
struct sum_buf {
OFF_T offset; /**< offset in file of this chunk */
- int len; /**< length of chunk of file */
+ unsigned int len; /**< length of chunk of file */
int i; /**< index of this chunk */
uint32 sum1; /**< simple checksum */
char sum2[SUM_LENGTH]; /**< checksum */
struct sum_struct {
OFF_T flength; /**< total file length */
size_t count; /**< how many chunks */
- size_t remainder; /**< flength % block_length */
- size_t blength; /**< block_length */
- size_t s2length; /**< sum2_length */
+ unsigned int blength; /**< block_length */
+ unsigned int remainder; /**< flength % block_length */
+ int s2length; /**< sum2_length */
struct sum_buf *sums; /**< points to info for each chunk */
};
struct map_struct {
- char *p;
- int fd,p_size,p_len;
- OFF_T file_size, p_offset, p_fd_offset;
+ 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 */
};
-#define MATCHFLG_WILD 0x0001 /* pattern has '*', '[', and/or '?' */
-#define MATCHFLG_WILD2 0x0002 /* pattern has '**' */
-#define MATCHFLG_WILD2_PREFIX 0x0004 /* pattern starts with '**' */
-#define MATCHFLG_ABS_PATH 0x0008 /* path-match on absolute path */
+#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 {
char *pattern;
int match_flags;
int flist_size;
int num_files;
int num_transferred_files;
+ int current_file_index;
};
#include "byteorder.h"
#include "lib/mdfour.h"
+#include "lib/wildmatch.h"
#include "lib/permstring.h"
#include "lib/addrinfo.h"
#endif
+/* Convenient wrappers for malloc and realloc. Use them. */
+#define new(type) ((type *)malloc(sizeof(type)))
+#define new_array(type, num) ((type *)_new_array(sizeof(type), (num)))
+#define realloc_array(ptr, type, num) ((type *)_realloc_array((ptr), sizeof(type), (num)))
/* use magic gcc attributes to catch format errors */
void rprintf(enum logcode , const char *, ...)