X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/3333ffbd431e6164fe29b096ab67ff0cfda35a56..3b3c3d43904091669895a1687ad44005899c0964:/rsync.h diff --git a/rsync.h b/rsync.h index 13bc9dd7..2964dc10 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 @@ -132,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 @@ -163,10 +172,21 @@ #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 + #ifndef S_IFLNK #define S_IFLNK 0120000 #endif @@ -175,10 +195,18 @@ #define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) #endif +#define BOOL int + #ifndef uchar #define uchar unsigned char #endif +#if HAVE_UNSIGNED_CHAR +#define schar signed char +#else +#define schar char +#endif + #ifndef int32 #if (SIZEOF_INT == 4) #define int32 int @@ -193,10 +221,25 @@ #define uint32 unsigned int32 #endif -#ifdef HAVE_LONGLONG +#if HAVE_OFF64_T +#define OFF_T off64_t +#define STRUCT_STAT struct stat64 +#else +#define OFF_T off_t +#define STRUCT_STAT struct stat +#endif + +#if HAVE_OFF64_T +#define int64 off64_t +#elif (SIZEOF_LONG == 8) +#define int64 long +#elif (SIZEOF_INT == 8) +#define int64 int +#elif HAVE_LONGLONG #define int64 long long #else #define int64 off_t +#define NO_INT64 #endif #ifndef MIN @@ -215,10 +258,14 @@ #define MAXPATHLEN 1024 #endif +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + struct file_struct { unsigned flags; time_t modtime; - off_t length; + OFF_T length; mode_t mode; ino_t inode; dev_t dev; @@ -239,7 +286,7 @@ struct file_list { }; struct sum_buf { - off_t offset; /* offset in file of this chunk */ + 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 */ @@ -247,7 +294,7 @@ struct sum_buf { }; struct sum_struct { - off_t flength; /* total file length */ + OFF_T flength; /* total file length */ int count; /* how many chunks */ int remainder; /* flength % block_length */ int n; /* block_length */ @@ -257,9 +304,19 @@ struct sum_struct { struct map_struct { char *map,*p; int fd,p_size,p_len; - off_t size, p_offset; + OFF_T size, p_offset; }; +struct exclude_struct { + char *orig; + char *pattern; + int regular_exp; + int include; + int directory; + int local; +}; + + /* 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 */ @@ -269,6 +326,20 @@ 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" @@ -285,21 +356,6 @@ extern char *sys_errlist[]; # define strrchr rindex #endif -#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 HAVE_ERRNO_DECL extern int errno; #endif @@ -349,6 +405,22 @@ extern int errno; #define S_ISCHR(mode) (((mode) & (_S_IFMT)) == (_S_IFCHR)) #endif +#ifndef S_ISSOCK +#ifdef _S_IFSOCK +#define S_ISSOCK(mode) (((mode) & (_S_IFMT)) == (_S_IFSOCK)) +#else +#define S_ISSOCK(mode) (0) +#endif +#endif + +#ifndef S_ISFIFO +#ifdef _S_IFIFO +#define S_ISFIFO(mode) (((mode) & (_S_IFMT)) == (_S_IFIFO)) +#else +#define S_ISFIFO(mode) (0) +#endif +#endif + #ifndef S_ISDIR #define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR)) #endif @@ -357,5 +429,6 @@ extern int errno; #define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) #endif -#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) + +#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))