X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5dd7e031675d21c2ab28d464d64422ee1f097341..e1b3d5c4be46ee0b17a98aa48cb7cb152c4a008b:/rsync.h diff --git a/rsync.h b/rsync.h index 1a691586..41f480ec 100644 --- a/rsync.h +++ b/rsync.h @@ -41,7 +41,7 @@ #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 @@ -50,14 +50,13 @@ #define SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) -#define MAX_MAP_SIZE (4*1024*1024) -#define IO_BUFFER_SIZE (4096) +#define MAX_MAP_SIZE (1*1024*1024) +#define IO_BUFFER_SIZE (4092) #define MAX_READ_BUFFER (1024*1024) #define MAX_ARGS 1000 -#define BLOCKING_TIMEOUT 10 - +#define MPLEX_BASE 7 #define FERROR 1 #define FINFO 2 @@ -141,8 +140,9 @@ #endif #include -#ifdef HAVE_MMAP +#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #include +#define USE_MMAP 1 #endif #ifdef HAVE_UTIME_H @@ -280,9 +280,9 @@ struct file_struct { }; struct file_list { - int count; - int malloced; - struct file_struct **files; + int count; + int malloced; + struct file_struct **files; }; struct sum_buf { @@ -307,6 +307,28 @@ struct map_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 */