- check for sys/select.h

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 98d801c..34792fc 100644 (file)
--- 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
 
@@ -60,9 +71,12 @@
 #include <sys/param.h>
 #endif
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
 #endif
 
 #ifdef HAVE_COMPAT_H
@@ -122,6 +136,10 @@
 #include <utime.h>
 #endif
 
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #ifdef HAVE_FNMATCH
 #include <fnmatch.h>
 #else
@@ -167,6 +185,7 @@
 #endif
 
 /* the length of the md4 checksum */
+#define MD4_SUM_LENGTH 16
 #define SUM_LENGTH 16
 
 #ifndef MAXPATHLEN
@@ -185,7 +204,7 @@ struct file_struct {
   char *name;
   char *dir;
   char *link;
-  char sum[SUM_LENGTH];
+  char sum[MD4_SUM_LENGTH];
 };
 
 struct file_list {
@@ -199,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 {
@@ -210,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"
@@ -264,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))