Add --omit-link-times and use CAN_SET_SYMLINK_TIMES less.

[rsync.git] / rsync.h

diff --git a/rsync.h b/rsync.h
index 61f1c47c5501c5562420a0a9a79405101cd4f751..4a5313e9654dddbe08ea041b85691a8d4368bf53 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -98,7 +98,7 @@
 /* This is used when working on a new protocol version in CVS, and should
  * be a new non-zero value for each CVS change that affects the protocol.
  * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */
-#define SUBPROTOCOL_VERSION 11
+#define SUBPROTOCOL_VERSION 12
 
 /* We refuse to interoperate with versions that are not in this range.
  * Note that we assume we'll work with later versions: the onus is on
@@ -136,6 +136,8 @@
 /* For compatibility with older rsyncs */
 #define OLD_MAX_BLOCK_SIZE ((int32)1 << 29)
 
+#define ROUND_UP_1024(siz) ((siz) & (1024-1) ? ((siz) | (1024-1)) + 1 : (siz))
+
 #define IOERR_GENERAL  (1<<0) /* For backward compatibility, this must == 1 */
 #define IOERR_VANISHED (1<<1)
 #define IOERR_DEL_LIMIT (1<<2)
@@ -232,8 +234,8 @@ enum msgcode {
        MSG_STATS=10,   /* message has stats data for generator */
        MSG_IO_ERROR=22,/* the sending side had an I/O error */
        MSG_IO_TIMEOUT=33,/* tell client about a daemon's timeout value */
-       MSG_NOOP=42,    /* a do-nothing message */
-       MSG_ERROR_EXIT=86, /* used by siblings and by protocol-31 */
+       MSG_NOOP=42,    /* a do-nothing message (legacy protocol-30 only) */
+       MSG_ERROR_EXIT=86, /* synchronize an error exit (siblings and protocol >= 31) */
        MSG_SUCCESS=100,/* successfully updated indicated flist index */
        MSG_DELETED=101,/* successfully deleted a file on receiving side */
        MSG_NO_SEND=102,/* sender failed to open a file we wanted */
@@ -265,6 +267,10 @@ enum delret {
 #define MKP_DROP_NAME          (1<<0) /* drop trailing filename or trailing slash */
 #define MKP_SKIP_SLASH         (1<<1) /* skip one or more leading slashes */
 
+/* Defines for maybe_send_keepalive() */
+#define MSK_ALLOW_FLUSH        (1<<0)
+#define MSK_ACTIVE_RECEIVER    (1<<1)
+
 #include "errcode.h"
 
 #include "config.h"
@@ -686,10 +692,10 @@ extern int xattrs_ndx;
 #define F_LENGTH(f) ((int64)(f)->len32)
 #else
 #define F_LENGTH(f) ((int64)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \
-                  ? (int64)OPT_EXTRA(f, 0)->unum << 32 : 0))
+                  ? (int64)OPT_EXTRA(f, NSEC_BUMP(f))->unum << 32 : 0))
 #endif
 
-#define F_MOD_NSEC(f) ((f)->flags & FLAG_MOD_NSEC ? OPT_EXTRA(f, LEN64_BUMP(f))->unum : 0)
+#define F_MOD_NSEC(f) ((f)->flags & FLAG_MOD_NSEC ? OPT_EXTRA(f, 0)->unum : 0)
 
 /* If there is a symlink string, it is always right after the basename */
 #define F_SYMLINK(f) ((f)->basename + strlen((f)->basename) + 1)
@@ -1111,6 +1117,10 @@ extern int errno;
 #define IS_SPECIAL(mode) (S_ISSOCK(mode) || S_ISFIFO(mode))
 #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
 
+#define PRESERVE_FILE_TIMES    (1<<0)
+#define PRESERVE_DIR_TIMES     (1<<1)
+#define PRESERVE_LINK_TIMES    (1<<2)
+
 /* 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 */