X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/494d049ce17d3b210ce4503ae3034c6d83532b94..c73f2a3831bc2f882dddd3ef2cc1eb0cb20ceeeb:/rsync.h

diff --git a/rsync.h b/rsync.h
index 989ebbd0..76e7f497 100644
--- a/rsync.h
+++ b/rsync.h
@@ -122,7 +122,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 MAX_BLOCK_SIZE ((int32)1 << 17)
 
 #define IOERR_GENERAL	(1<<0) /* For backward compatibility, this must == 1 */
 #define IOERR_VANISHED	(1<<1)
@@ -183,6 +183,10 @@
 #define SIGNIFICANT_ITEM_FLAGS (~(\
 	ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
 
+#define CFN_KEEP_LEADING_DOT_DIR (1<<0)
+#define CFN_KEEP_TRAILING_SLASH (1<<1)
+#define CFN_DROP_TRAILING_DOT_DIR (1<<2)
+#define CFN_COLLAPSE_DOT_DOT_DIRS (1<<3)
 
 /* Log-message categories.  Only FERROR and FINFO get sent over the socket,
  * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe.
@@ -391,6 +395,22 @@ enum msgcode {
 
 #include "lib/pool_alloc.h"
 
+#ifndef HAVE_ID_T
+typedef int id_t;
+#endif
+#ifndef HAVE_PID_T
+typedef int pid_t;
+#endif
+#ifndef HAVE_MODE_T
+typedef int mode_t;
+#endif
+#ifndef HAVE_OFF_T
+typedef long off_t;
+#endif
+#ifndef HAVE_SIZE_T
+typedef unsigned int size_t;
+#endif
+
 #define BOOL int
 
 #ifndef uchar
@@ -821,7 +841,7 @@ typedef struct {
 #define RL_CONVERT (1<<2)
 
 typedef struct {
-	char is_dot_dir;
+	char name_type;
 	char fname[1]; /* has variable size */
 } relnamecache;