added support for 64 bit file offsets under Solaris 2.6. Not tested

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 2ee5e03..34eeb57 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -28,7 +28,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)
@@ -39,11 +39,11 @@
 #define SAME_TIME (1<<7)
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 15
+#define PROTOCOL_VERSION 17
 #define MIN_PROTOCOL_VERSION 11
-#define MAX_PROTOCOL_VERSION 20
+#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)
@@ -193,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))
@@ -211,8 +231,9 @@
 #endif
 
 struct file_struct {
+       unsigned flags;
        time_t modtime;
-       off_t length;
+       OFF_T length;
        mode_t mode;
        ino_t inode;
        dev_t dev;
@@ -223,7 +244,7 @@ struct file_struct {
        char *dirname;
        char *basedir;
        char *link;
-       char sum[MD4_SUM_LENGTH];
+       char *sum;
 };
 
 struct file_list {
@@ -233,7 +254,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 */
@@ -241,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 */
@@ -249,14 +270,15 @@ 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 int flist_up(struct file_list *flist, int i)
+static inline int flist_up(struct file_list *flist, int i)
 {
        while (!flist->files[i]->basename) i++;
        return i;
@@ -342,6 +364,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
@@ -350,5 +388,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))