Checking in the g2r-basis-filename patch that ensures that the receiver

[rsync/rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 07f447b..b417ba6 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -108,6 +108,7 @@
 #define XFLG_DEF_INCLUDE       (1<<1)
 #define XFLG_WORDS_ONLY        (1<<2)
 #define XFLG_WORD_SPLIT        (1<<3)
+#define XFLG_DIRECTORY         (1<<4)
 
 #define PERMS_REPORT           (1<<0)
 #define PERMS_SKIP_MTIME       (1<<1)
@@ -115,6 +116,14 @@
 #define FULL_FLUSH     1
 #define NORMAL_FLUSH   0
 
+#define PDIR_CREATE    1
+#define PDIR_DELETE    0
+
+#define FNAMECMP_CMPDEST       0x00
+#define FNAMECMP_FNAME         0x80
+#define FNAMECMP_PARTIAL_DIR   0x81
+#define FNAMECMP_BACKUP        0x82
+
 
 /* Log-message categories.  FLOG is only used on the daemon side to
  * output messages to the log file. */
@@ -251,6 +260,9 @@ enum msgcode {
 
 #if MAJOR_IN_MKDEV
 #include <sys/mkdev.h>
+# if !defined(makedev) && defined(mkdev)
+#  define makedev mkdev
+# endif
 #elif MAJOR_IN_SYSMACROS
 #include <sys/sysmacros.h>
 #endif
@@ -312,7 +324,7 @@ enum msgcode {
 #else
 /* As long as it gets... */
 #define int64 off_t
-#define NO_INT64
+#define INT64_IS_OFF_T
 #endif
 
 #if (SIZEOF_LONG == 8) 
@@ -480,11 +492,9 @@ struct sum_struct {
 struct map_struct {
        char *p;                /* Window pointer                       */
        int fd;                 /* File Descriptor                      */
-       int p_size;             /* Window size at allocation            */
-       int p_len;              /* Window size after fill               */
-                               /*    p_size and p_len could be
-                                *    consolodated by using a local
-                                *    variable in map_ptr()             */
+       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                         */