#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 17
+#define PROTOCOL_VERSION 19
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (4*1024*1024)
+#define MAX_MAP_SIZE (1*1024*1024)
+#define IO_BUFFER_SIZE (4092)
+#define MAX_READ_BUFFER (1024*1024)
-#define MAX_ARGS 100
-
-#define BLOCKING_TIMEOUT 10
+#define MAX_ARGS 1000
+#define MPLEX_BASE 7
#define FERROR 1
#define FINFO 2
#endif
#include <sys/types.h>
+
+#ifdef HAVE_GETOPT_LONG
+#include <getopt.h>
+#else
+#include "lib/getopt.h"
+#endif
+
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <string.h>
#endif
-#ifdef HAVE_COMPAT_H
-#include <compat.h>
-#endif
-
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#endif
#include <errno.h>
-#ifdef HAVE_MMAP
+#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
#include <sys/mman.h>
+#define USE_MMAP 1
#endif
#ifdef HAVE_UTIME_H
#include "lib/fnmatch.h"
#endif
-#ifdef HAVE_GETOPT_LONG
-#include <getopt.h>
-#else
-#include "lib/getopt.h"
+#ifdef HAVE_GLOB
+#include <glob.h>
#endif
/* these are needed for the uid/gid mapping code */
#include <arpa/inet.h>
#include <netdb.h>
#include <syslog.h>
+#include <sys/file.h>
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
+#endif
+
+#ifdef HAVE_COMPAT_H
+#include <compat.h>
+#endif
+
#ifndef S_IFLNK
#define S_IFLNK 0120000
#define NO_INT64
#endif
+#if HAVE_SHORT_INO_T
+#define INO_T uint32
+#else
+#define INO_T ino_t
+#endif
+
#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
#endif
#define MAXPATHLEN 1024
#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
OFF_T length;
mode_t mode;
- ino_t inode;
+ INO_T inode;
dev_t dev;
dev_t rdev;
uid_t uid;
};
struct file_list {
- int count;
- int malloced;
- struct file_struct **files;
+ int count;
+ int malloced;
+ struct file_struct **files;
};
struct sum_buf {
- OFF_T offset; /* offset in file of this chunk */
- int len; /* length of chunk of file */
- int i; /* index of this chunk */
- uint32 sum1; /* simple checksum */
- char sum2[SUM_LENGTH]; /* checksum */
+ OFF_T offset; /* offset in file of this chunk */
+ 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 size, p_offset;
};
+struct exclude_struct {
+ char *orig;
+ char *pattern;
+ int regular_exp;
+ int include;
+ int directory;
+ int local;
+};
+
+struct stats {
+ int64 total_size;
+ int64 total_transferred_size;
+ int64 total_written;
+ int64 total_read;
+ int64 literal_data;
+ int64 matched_data;
+ int flist_size;
+ int num_files;
+ int num_transferred_files;
+};
+
+
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
without breaking existing versions */
return i;
}
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-#endif
-
#include "byteorder.h"
#include "version.h"
#include "proto.h"
extern int errno;
#endif
-#ifndef HAVE_BCOPY
-#define bcopy(src,dest,n) memcpy(dest,src,n)
-#endif
-
-#ifndef HAVE_BZERO
-#define bzero(buf,n) memset(buf,0,n)
-#endif
-
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
+#ifndef ACCESSPERMS
+#define ACCESSPERMS 0777
+#endif