X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/536b84680b4ab1f29fa456b4fa7b5b16eff4af8f..1b2db7aecbaa21ab0ea04cce020ac0827aa2d230:/rsync.h

diff --git a/rsync.h b/rsync.h
index 0477a4c4..beddf51f 100644
--- a/rsync.h
+++ b/rsync.h
@@ -57,13 +57,19 @@
  * people writing them to make sure that they don't send us anything
  * we won't understand.
  *
+ * Interoperation with old but supported protocol versions
+ * should cause a warning to be printed.  At a future date
+ * the old protocol will become the minimum and
+ * compatibility code removed.
+ *
  * There are two possible explanations for the limit at thirty: either
  * to allow new major-rev versions that do not interoperate with us,
  * and (more likely) so that we can detect an attempt to connect rsync
  * to a non-rsync server, which is unlikely to begin by sending a byte
  * between 15 and 30. */
 #define MIN_PROTOCOL_VERSION 15
-#define MAX_PROTOCOL_VERSION 30
+#define OLD_PROTOCOL_VERSION 20
+#define MAX_PROTOCOL_VERSION 40
 
 #define RSYNC_PORT 873
 
@@ -497,6 +503,16 @@ extern int errno;
 #define S_IWUSR 0200
 #endif
 
+#ifndef ACCESSPERMS
+#define ACCESSPERMS 0777
+#endif
+
+#ifndef S_ISVTX
+#define S_ISVTX 0
+#endif
+
+#define CHMOD_BITS (S_ISUID | S_ISGID | S_ISVTX | ACCESSPERMS)
+
 #ifndef _S_IFMT
 #define _S_IFMT        0170000
 #endif
@@ -560,9 +576,6 @@ extern int errno;
 
 #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
 
-#ifndef ACCESSPERMS
-#define ACCESSPERMS 0777
-#endif
 /* Initial mask on permissions given to temporary files.  Mask off setuid
      bits and group access because of potential race-condition security
      holes, and mask other access because mode 707 is bizarre */
@@ -595,20 +608,6 @@ void rsyserr(enum logcode, int, const char *, ...)
 #define inet_ntoa rep_inet_ntoa
 #endif
 
-/* Compatibility defines so that platforms that don't distinguish between
- * text and binary files (like Cygwin does) can use the same code. */
-#ifndef O_TEXT
-#define O_TEXT 0
-#define O_TEXT_STR ""
-#else
-#define O_TEXT_STR "t"
-#endif
-#ifndef O_BINARY
-#define O_BINARY 0
-#define O_BINARY_STR ""
-#else
-#define O_BINARY_STR "b"
-#endif
 
 #ifndef HAVE_STRLCPY
 size_t strlcpy(char *d, const char *s, size_t bufsize);