X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ebb0a6f61826aeaba0aeb1866df41dee8b7c7269..bcacc18bdf1bdac625ef1f178e8e32892544cc30:/rsync.h diff --git a/rsync.h b/rsync.h index 9301062a..34eeb575 100644 --- a/rsync.h +++ b/rsync.h @@ -19,11 +19,16 @@ #define BLOCK_SIZE 700 #define RSYNC_RSH_ENV "RSYNC_RSH" -#define RSYNC_RSH "rsh" + #define RSYNC_NAME "rsync" #define BACKUP_SUFFIX "~" -#define FILE_VALID 1 +/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is + imcompatible with older versions :-( */ +#define CHAR_OFFSET 0 + + +#define FLAG_DELETE (1<<0) #define SAME_MODE (1<<1) #define SAME_RDEV (1<<2) #define SAME_UID (1<<3) @@ -34,11 +39,11 @@ #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 17 +#define MIN_PROTOCOL_VERSION 11 +#define MAX_PROTOCOL_VERSION 30 -#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) @@ -50,6 +55,12 @@ #include "config.h" +#if HAVE_REMSH +#define RSYNC_RSH "remsh" +#else +#define RSYNC_RSH "rsh" +#endif + #include #ifdef HAVE_UNISTD_H #include @@ -64,6 +75,10 @@ #include #endif +#ifdef HAVE_SYS_SOCKET_H +#include +#endif + #ifdef HAVE_STRING_H #include #endif @@ -125,6 +140,17 @@ #include #endif +#ifdef HAVE_SYS_SELECT_H +#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 @@ -137,6 +163,13 @@ #include "lib/getopt.h" #endif +/* these are needed for the uid/gid mapping code */ +#include +#include + +#ifndef S_IFLNK +#define S_IFLNK 0120000 +#endif #ifndef S_ISLNK #define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) @@ -160,6 +193,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)) @@ -178,28 +231,30 @@ #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 */ @@ -207,7 +262,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 */ @@ -215,10 +270,21 @@ 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; }; +/* 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; +} + + #include "byteorder.h" #include "version.h" #include "proto.h" @@ -261,15 +327,11 @@ 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 +#ifndef HAVE_LCHOWN +#define lchown chown #endif #define SIGNAL_CAST (RETSIGTYPE (*)()) @@ -278,5 +340,54 @@ extern int errno; #define EWOULDBLOCK EAGAIN #endif -#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) +#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 + +#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))