- Moved write_sum_head() to io.c.

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 785eb19..c06ffac 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -62,7 +62,7 @@
 #define FLAG_MOUNT_POINT (1<<2)        /* sender only */
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 28
+#define PROTOCOL_VERSION 29
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -92,6 +92,7 @@
 #define CHUNK_SIZE (32*1024)
 #define MAX_MAP_SIZE (256*1024)
 #define IO_BUFFER_SIZE (4092)
+#define MAX_BLOCK_SIZE ((int32)1 << 29)
 
 #define IOERR_GENERAL  (1<<0) /* For backward compatibility, this must == 1 */
 #define IOERR_VANISHED (1<<1)
@@ -121,7 +122,9 @@
 #define PDIR_CREATE    1
 #define PDIR_DELETE    0
 
-#define FNAMECMP_BASIS_DIR     0x00
+/* Note: 0x00 - 0x7F are used for basis_dir[] indexes! */
+#define FNAMECMP_BASIS_DIR_LOW 0x00 /* Must remain 0! */
+#define FNAMECMP_BASIS_DIR_HIGH 0x7F
 #define FNAMECMP_FNAME         0x80
 #define FNAMECMP_PARTIAL_DIR   0x81
 #define FNAMECMP_BACKUP        0x82
@@ -411,8 +414,8 @@ struct idev {
 #define HL_SKIP                1
 
 struct hlink {
-       int hlindex;
        struct file_struct *next;
+       int hlindex;
 };
 
 #define F_DEV  link_u.idev->dev
@@ -465,18 +468,18 @@ struct file_struct {
 #define WITHOUT_HLINK  0
 
 struct file_list {
-       int count;
-       int malloced;
+       struct file_struct **files;
        alloc_pool_t file_pool;
        alloc_pool_t hlink_pool;
-       struct file_struct **files;
+       int count;
+       int malloced;
 };
 
 #define SUMFLG_SAME_OFFSET     (1<<0)
 
 struct sum_buf {
        OFF_T offset;           /**< offset in file of this chunk */
-       unsigned int len;       /**< length of chunk of file */
+       int32 len;              /**< length of chunk of file */
        uint32 sum1;            /**< simple checksum */
        short flags;            /**< flag bits */
        char sum2[SUM_LENGTH];  /**< checksum  */
@@ -484,23 +487,23 @@ struct sum_buf {
 
 struct sum_struct {
        OFF_T flength;          /**< total file length */
+       struct sum_buf *sums;   /**< points to info for each chunk */
        size_t count;           /**< how many chunks */
-       unsigned int blength;   /**< block_length */
-       unsigned int remainder; /**< flength % block_length */
+       int32 blength;          /**< block_length */
+       int32 remainder;        /**< flength % block_length */
        int s2length;           /**< sum2_length */
-       struct sum_buf *sums;   /**< points to info for each chunk */
 };
 
 struct map_struct {
-       char *p;                /* Window pointer                       */
-       int fd;                 /* File Descriptor                      */
-       int p_size;             /* Largest window size we allocated     */
-       int p_len;              /* Latest (rounded) window size         */
-       int def_window_size;    /* Default window size                  */
-       int status;             /* first errno from read errors         */
        OFF_T file_size;        /* File size (from stat)                */
        OFF_T p_offset;         /* Window start                         */
        OFF_T p_fd_offset;      /* offset of cursor in fd ala lseek     */
+       char *p;                /* Window pointer                       */
+       int32 p_size;           /* Largest window size we allocated     */
+       int32 p_len;            /* Latest (rounded) window size         */
+       int32 def_window_size;  /* Default window size                  */
+       int fd;                 /* File Descriptor                      */
+       int status;             /* first errno from read errors         */
 };
 
 #define MATCHFLG_WILD          (1<<0) /* pattern has '*', '[', and/or '?' */
@@ -591,13 +594,6 @@ extern int errno;
 #define SUPPORT_LINKS HAVE_READLINK
 #define SUPPORT_HARD_LINKS HAVE_LINK
 
-/* This could be bad on systems which have no lchown and where chown
- * follows symbollic links.  On such systems it might be better not to
- * try to chown symlinks at all. */
-#ifndef HAVE_LCHOWN
-#define lchown chown
-#endif
-
 #define SIGNAL_CAST (RETSIGTYPE (*)())
 
 #ifndef EWOULDBLOCK