X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7bec6a5cd6cabe93163707b901482a6692ca78cf..cbbe4892087b74fb8ed2aac6078ee933ac02e920:/rsync.h

diff --git a/rsync.h b/rsync.h
index 36e8f5bd..5759ef28 100644
--- a/rsync.h
+++ b/rsync.h
@@ -19,13 +19,18 @@
 
 #define BLOCK_SIZE 700
 #define RSYNC_RSH_ENV "RSYNC_RSH"
-#define RSYNC_RSH "rsh"
+
 #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_DEV (1<<2)
+#define SAME_RDEV (1<<2)
 #define SAME_UID (1<<3)
 #define SAME_GID (1<<4)
 #define SAME_DIR (1<<5)
@@ -34,21 +39,28 @@
 #define SAME_TIME (1<<7)
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 11
+#define PROTOCOL_VERSION 14
 #define MIN_PROTOCOL_VERSION 10
 #define MAX_PROTOCOL_VERSION 20
 
-/* block size to write files in */
-#define WRITE_BLOCK_SIZE (32*1024)
+#define SPARSE_WRITE_SIZE (4*1024)
+#define WRITE_SIZE (32*1024)
+#define CHUNK_SIZE (32*1024)
 #define MAX_MAP_SIZE (4*1024*1024)
 
 #define BLOCKING_TIMEOUT 10
 
-/* do we try to create sparse files */
-#define SPARSE_FILES 1
+#define FERROR stderr
+#define FINFO (am_server?stderr:stdout)
 
 #include "config.h"
 
+#if HAVE_REMSH
+#define RSYNC_RSH "remsh"
+#else
+#define RSYNC_RSH "rsh"
+#endif
+
 #include <sys/types.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -59,9 +71,16 @@
 #include <sys/param.h>
 #endif
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
 #endif
 
 #ifdef HAVE_COMPAT_H
@@ -121,6 +140,17 @@
 #include <utime.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_MODE_H
+/* apparently AIX needs this for S_ISLNK */
+#ifndef S_ISLNK
+#include <sys/mode.h>
+#endif
+#endif
+
 #ifdef HAVE_FNMATCH
 #include <fnmatch.h>
 #else
@@ -133,6 +163,9 @@
 #include "lib/getopt.h"
 #endif
 
+#ifndef S_IFLNK
+#define S_IFLNK  0120000
+#endif
 
 #ifndef S_ISLNK
 #define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
@@ -166,6 +199,7 @@
 #endif
 
 /* the length of the md4 checksum */
+#define MD4_SUM_LENGTH 16
 #define SUM_LENGTH 16
 
 #ifndef MAXPATHLEN
@@ -176,13 +210,15 @@ 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[SUM_LENGTH];
+  char sum[MD4_SUM_LENGTH];
 };
 
 struct file_list {
@@ -196,7 +232,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 {
@@ -207,6 +243,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"
@@ -250,21 +290,38 @@ extern int errno;
 #define bzero(buf,n) memset(buf,0,n)
 #endif
 
-#define SUPPORT_LINKS (HAVE_READLINK && defined(S_ISLNK))
-
-#ifndef S_ISLNK
-#define S_ISLNK(x) 0
-#endif
+#define SUPPORT_LINKS HAVE_READLINK
+#define SUPPORT_HARD_LINKS HAVE_LINK
 
 #if !SUPPORT_LINKS
 #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))