X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6c8f5373023d19f0bcc39e2fdb0aacf0652d40e5..654175798bdbdd6403e10c8fa74e8586b3612ea1:/rsync.h diff --git a/rsync.h b/rsync.h index 0368451a..e11b84a0 100644 --- a/rsync.h +++ b/rsync.h @@ -23,6 +23,8 @@ #define RSYNC_NAME "rsync" #define RSYNCD_CONF "/etc/rsyncd.conf" +#define URL_PREFIX "rsync://" + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -41,7 +43,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 +52,18 @@ #define SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) -#define MAX_MAP_SIZE (4*1024*1024) - -#define MAX_ARGS 100 +#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 MPLEX_BASE 7 #define FERROR 1 #define FINFO 2 +#define FLOG 3 + +#include "errcode.h" #include "config.h" @@ -68,6 +74,13 @@ #endif #include + +#ifdef HAVE_GETOPT_LONG +#include +#else +#include "lib/getopt.h" +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -90,10 +103,6 @@ #include #endif -#ifdef HAVE_COMPAT_H -#include -#endif - #ifdef HAVE_MALLOC_H #include #endif @@ -139,8 +148,9 @@ #endif #include -#ifdef HAVE_MMAP +#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #include +#define USE_MMAP 1 #endif #ifdef HAVE_UTIME_H @@ -164,10 +174,8 @@ #include "lib/fnmatch.h" #endif -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" +#ifdef HAVE_GLOB_H +#include #endif /* these are needed for the uid/gid mapping code */ @@ -181,14 +189,26 @@ #include #include -#ifndef S_IFLNK -#define S_IFLNK 0120000 +#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 -#ifndef S_ISLNK -#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) +#ifdef HAVE_COMPAT_H +#include #endif + #define BOOL int #ifndef uchar @@ -208,6 +228,10 @@ #define int32 long #elif (SIZEOF_SHORT == 4) #define int32 short +#else +/* I hope this works */ +#define int32 int +#define LARGE_INT32 #endif #endif @@ -236,6 +260,12 @@ #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 @@ -252,12 +282,16 @@ #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; @@ -270,17 +304,17 @@ 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 { - 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 { @@ -297,6 +331,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 */ @@ -306,25 +362,10 @@ 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" -#include "md4.h" +#include "lib/mdfour.h" #if !HAVE_STRERROR extern char *sys_errlist[]; @@ -340,14 +381,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 @@ -377,6 +410,18 @@ extern int errno; #define S_IWUSR 0200 #endif +#ifndef _S_IFMT +#define _S_IFMT 0170000 +#endif + +#ifndef _S_IFLNK +#define _S_IFLNK 0120000 +#endif + +#ifndef S_ISLNK +#define S_ISLNK(mode) (((mode) & (_S_IFMT)) == (_S_IFLNK)) +#endif + #ifndef S_ISBLK #define S_ISBLK(mode) (((mode) & (_S_IFMT)) == (_S_IFBLK)) #endif @@ -412,3 +457,20 @@ 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 + +/* handler for null strings in printf format */ +#define NS(s) ((s)?(s):"") + +/* use magic gcc attributes to catch format errors */ + void rprintf(int , const char *, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 2, 3))) +#endif +; + +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +#endif