X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d7b305fd9116056f4b5b9f96d9b4c51ed7d2ac60..8bf737494f17ca384b30db13b4bc31a5158f3646:/rsync.h diff --git a/rsync.h b/rsync.h index e27fd4fa..34792fc9 100644 --- a/rsync.h +++ b/rsync.h @@ -19,10 +19,21 @@ #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 BACKUP_SUFFIX "~" +/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is + imcompatible with older versions :-( */ +#define CHAR_OFFSET 0 + + #define FILE_VALID 1 #define SAME_MODE (1<<1) #define SAME_RDEV (1<<2) @@ -34,7 +45,7 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 12 +#define PROTOCOL_VERSION 14 #define MIN_PROTOCOL_VERSION 10 #define MAX_PROTOCOL_VERSION 20 @@ -125,6 +136,10 @@ #include #endif +#ifdef HAVE_SYS_SELECT_H +#include +#endif + #ifdef HAVE_FNMATCH #include #else @@ -170,6 +185,7 @@ #endif /* the length of the md4 checksum */ +#define MD4_SUM_LENGTH 16 #define SUM_LENGTH 16 #ifndef MAXPATHLEN @@ -188,7 +204,7 @@ struct file_struct { char *name; char *dir; char *link; - char sum[SUM_LENGTH]; + char sum[MD4_SUM_LENGTH]; }; struct file_list { @@ -202,7 +218,7 @@ struct sum_buf { int len; /* length of chunk of file */ int i; /* index of this chunk */ uint32 sum1; /* simple checksum */ - char sum2[SUM_LENGTH]; /* md4 checksum */ + char sum2[SUM_LENGTH]; /* checksum */ }; struct sum_struct { @@ -213,6 +229,10 @@ struct sum_struct { struct sum_buf *sums; /* points to info for each chunk */ }; +struct map_struct { + char *map,*p; + int fd,size,p_size,p_offset,p_len; +}; #include "byteorder.h" #include "version.h" @@ -267,11 +287,31 @@ extern int errno; #define lstat stat #endif +#ifndef HAVE_LCHOWN +#define lchown chown +#endif + #define SIGNAL_CAST (RETSIGTYPE (*)()) #ifndef EWOULDBLOCK #define EWOULDBLOCK EAGAIN #endif +#ifndef STDIN_FILENO +#define STDIN_FILENO 0 +#endif + +#ifndef STDOUT_FILENO +#define STDOUT_FILENO 1 +#endif + +#ifndef STDERR_FILENO +#define STDERR_FILENO 2 +#endif + +#ifndef S_IWUSR +#define S_IWUSR 0200 +#endif + #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))