X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8bf737494f17ca384b30db13b4bc31a5158f3646..3b3c3d43904091669895a1687ad44005899c0964:/rsync.h diff --git a/rsync.h b/rsync.h index 34792fc9..2964dc10 100644 --- a/rsync.h +++ b/rsync.h @@ -20,13 +20,9 @@ #define BLOCK_SIZE 700 #define RSYNC_RSH_ENV "RSYNC_RSH" -#if HAVE_REMSH -#define RSYNC_RSH "remsh" -#else -#define RSYNC_RSH "rsh" -#endif - #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 @@ -34,7 +30,7 @@ #define CHAR_OFFSET 0 -#define FILE_VALID 1 +#define FLAG_DELETE (1<<0) #define SAME_MODE (1<<1) #define SAME_RDEV (1<<2) #define SAME_UID (1<<3) @@ -45,27 +41,39 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 14 -#define MIN_PROTOCOL_VERSION 10 -#define MAX_PROTOCOL_VERSION 20 +#define PROTOCOL_VERSION 19 +#define MIN_PROTOCOL_VERSION 11 +#define MAX_PROTOCOL_VERSION 30 + +#define RSYNC_PORT 873 -#define SPARSE_WRITE_SIZE (4*1024) +#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" +#if HAVE_REMSH +#define RSYNC_RSH "remsh" +#else +#define RSYNC_RSH "rsh" +#endif + #include #ifdef HAVE_UNISTD_H #include #endif #include +#include #ifdef HAVE_SYS_PARAM_H #include @@ -75,6 +83,10 @@ #include #endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + #ifdef HAVE_STRING_H #include #endif @@ -128,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 @@ -140,6 +153,13 @@ #include #endif +#ifdef HAVE_SYS_MODE_H +/* apparently AIX needs this for S_ISLNK */ +#ifndef S_ISLNK +#include +#endif +#endif + #ifdef HAVE_FNMATCH #include #else @@ -152,15 +172,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 + +#ifndef S_IFLNK +#define S_IFLNK 0120000 +#endif #ifndef S_ISLNK #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 @@ -175,6 +221,26 @@ #define uint32 unsigned int32 #endif +#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 #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -192,29 +258,35 @@ #define MAXPATHLEN 1024 #endif +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + struct file_struct { - time_t modtime; - off_t length; - mode_t mode; - ino_t inode; - dev_t dev; - dev_t rdev; - uid_t uid; - gid_t gid; - char *name; - char *dir; - char *link; - char sum[MD4_SUM_LENGTH]; + unsigned flags; + time_t modtime; + OFF_T length; + mode_t mode; + ino_t inode; + dev_t dev; + dev_t rdev; + uid_t uid; + gid_t gid; + char *basename; + char *dirname; + char *basedir; + char *link; + char *sum; }; struct file_list { int count; int malloced; - struct file_struct *files; + struct file_struct **files; }; 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 */ @@ -222,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 */ @@ -230,24 +302,29 @@ struct sum_struct { }; struct map_struct { - char *map,*p; - int fd,size,p_size,p_offset,p_len; + char *map,*p; + int fd,p_size,p_len; + OFF_T size, p_offset; }; -#include "byteorder.h" -#include "version.h" -#include "proto.h" -#include "md4.h" +struct exclude_struct { + char *orig; + char *pattern; + int regular_exp; + int include; + int directory; + int local; +}; -#if !HAVE_STRERROR -extern char *sys_errlist[]; -#define strerror(i) sys_errlist[i] -#endif -#ifndef HAVE_STRCHR -# define strchr index -# define strrchr rindex -#endif +/* 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 */ +static inline int flist_up(struct file_list *flist, int i) +{ + while (!flist->files[i]->basename) i++; + return i; +} #if HAVE_DIRENT_H # include @@ -264,6 +341,21 @@ extern char *sys_errlist[]; # endif #endif +#include "byteorder.h" +#include "version.h" +#include "proto.h" +#include "md4.h" + +#if !HAVE_STRERROR +extern char *sys_errlist[]; +#define strerror(i) sys_errlist[i] +#endif + +#ifndef HAVE_STRCHR +# define strchr index +# define strrchr rindex +#endif + #ifndef HAVE_ERRNO_DECL extern int errno; #endif @@ -276,17 +368,9 @@ extern int errno; #define bzero(buf,n) memset(buf,0,n) #endif -#define SUPPORT_LINKS (HAVE_READLINK && defined(S_ISLNK)) +#define SUPPORT_LINKS HAVE_READLINK #define SUPPORT_HARD_LINKS HAVE_LINK -#ifndef S_ISLNK -#define S_ISLNK(x) 0 -#endif - -#if !SUPPORT_LINKS -#define lstat stat -#endif - #ifndef HAVE_LCHOWN #define lchown chown #endif @@ -313,5 +397,38 @@ extern int errno; #define S_IWUSR 0200 #endif -#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) +#ifndef S_ISBLK +#define S_ISBLK(mode) (((mode) & (_S_IFMT)) == (_S_IFBLK)) +#endif + +#ifndef S_ISCHR +#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 + +#ifndef S_ISREG +#define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) +#endif + + +#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))