X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d6e6ecbdbf0452ec95afc98c2700076e39b4692f..c95da96a0c51c66c8cb2eff97b768a717d9e0c79:/rsync.h diff --git a/rsync.h b/rsync.h index 14910462..deb20a23 100644 --- a/rsync.h +++ b/rsync.h @@ -21,6 +21,8 @@ #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" +#define RSYNCD_CONF "/etc/rsyncd.conf" + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -39,19 +41,24 @@ #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 RSYNC_PORT 873 + #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 BLOCKING_TIMEOUT 10 +#define MAX_ARGS 1000 -#define FERROR stderr -#define FINFO (am_server?stderr:stdout) +#define MPLEX_BASE 7 +#define FERROR 1 +#define FINFO 2 #include "config.h" @@ -66,6 +73,7 @@ #include #endif #include +#include #ifdef HAVE_SYS_PARAM_H #include @@ -83,10 +91,6 @@ #include #endif -#ifdef HAVE_COMPAT_H -#include -#endif - #ifdef HAVE_MALLOC_H #include #endif @@ -132,8 +136,9 @@ #endif #include -#ifdef HAVE_MMAP +#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #include +#define USE_MMAP 1 #endif #ifdef HAVE_UTIME_H @@ -163,10 +168,41 @@ #include "lib/getopt.h" #endif +#ifdef HAVE_GLOB +#include +#endif + /* these are needed for the uid/gid mapping code */ #include #include +#include +#include +#include +#include +#include +#include + +#if HAVE_DIRENT_H +# include +#else +# define dirent direct +# if HAVE_SYS_NDIR_H +# include +# endif +# if HAVE_SYS_DIR_H +# include +# endif +# if HAVE_NDIR_H +# include +# endif +#endif + +#ifdef HAVE_COMPAT_H +#include +#endif + + #ifndef S_IFLNK #define S_IFLNK 0120000 #endif @@ -175,6 +211,8 @@ #define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) #endif +#define BOOL int + #ifndef uchar #define uchar unsigned char #endif @@ -236,6 +274,10 @@ #define MAXPATHLEN 1024 #endif +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + struct file_struct { unsigned flags; time_t modtime; @@ -254,9 +296,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 { @@ -281,6 +323,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 */ @@ -290,21 +354,6 @@ static inline int flist_up(struct file_list *flist, int i) return i; } -#if HAVE_DIRENT_H -# include -#else -# define dirent direct -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif - #include "byteorder.h" #include "version.h" #include "proto.h" @@ -324,14 +373,6 @@ extern char *sys_errlist[]; 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 @@ -396,3 +437,6 @@ extern int errno; #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) +#ifndef ACCESSPERMS +#define ACCESSPERMS 0777 +#endif