Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of some superfluous empty lines.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b65e53b
..
b97b909
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-58,11
+58,12
@@
/* These flags are used in the live flist data. */
#define FLAG_TOP_DIR (1<<0)
/* These flags are used in the live flist data. */
#define FLAG_TOP_DIR (1<<0)
-#define FLAG_HLINK_EOL (1<<1) /*
generator only
*/
-#define FLAG_MOUNT_POINT (1<<2) /* sender
only
*/
-#define FLAG_NO_FUZZY (1<<2) /* generator
only
*/
+#define FLAG_HLINK_EOL (1<<1) /*
receiver/generator
*/
+#define FLAG_MOUNT_POINT (1<<2) /* sender */
+#define FLAG_NO_FUZZY (1<<2) /* generator */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
#define FLAG_DEL_HERE (1<<3) /* receiver/generator */
-#define FLAG_SENT (1<<3) /* sender only */
+#define FLAG_SENT (1<<3) /* sender */
+#define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
@@
-99,10
+100,11
@@
#define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */
#define IOERR_VANISHED (1<<1)
#define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */
#define IOERR_VANISHED (1<<1)
+#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
#define MAX_ARGS 1000
-
#define MAX_BASIS_DIRS 20
#define MAX_BASIS_DIRS 20
+#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100)
#define MPLEX_BASE 7
#define MPLEX_BASE 7
@@
-113,6
+115,7
@@
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
#define XFLG_ANCHORED2ABS (1<<2)
#define XFLG_FATAL_ERRORS (1<<0)
#define XFLG_OLD_PREFIXES (1<<1)
#define XFLG_ANCHORED2ABS (1<<2)
+#define XFLG_ABS_IF_SLASH (1<<3)
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
@@
-137,20
+140,26
@@
#define DEL_TERSE (1<<3)
/* For use by the itemize_changes code */
#define DEL_TERSE (1<<3)
/* For use by the itemize_changes code */
-#define ITEM_UPDATING (1<<0)
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
#define ITEM_REPORT_TIME (1<<3)
#define ITEM_REPORT_PERMS (1<<4)
#define ITEM_REPORT_OWNER (1<<5)
#define ITEM_REPORT_GROUP (1<<6)
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
#define ITEM_REPORT_TIME (1<<3)
#define ITEM_REPORT_PERMS (1<<4)
#define ITEM_REPORT_OWNER (1<<5)
#define ITEM_REPORT_GROUP (1<<6)
-#define ITEM_IS_NEW (1<<7)
-#define ITEM_USING_ALT_BASIS (1<<8)
+#define ITEM_REPORT_XATTRS (1<<7)
+#define ITEM_BASIS_TYPE_FOLLOWS (1<<11)
+#define ITEM_XNAME_FOLLOWS (1<<12)
+#define ITEM_IS_NEW (1<<13)
+#define ITEM_LOCAL_CHANGE (1<<14)
+#define ITEM_TRANSFER (1<<15)
/* These are outside the range of the transmitted flags. */
#define ITEM_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */
#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */
#define ITEM_DELETED (1<<17) /* used by log_formatted() */
/* These are outside the range of the transmitted flags. */
#define ITEM_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */
#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */
#define ITEM_DELETED (1<<17) /* used by log_formatted() */
+#define SIGNIFICANT_ITEM_FLAGS (~(\
+ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE))
+
/* Log-message categories. FLOG and FCLIENT are only used on the daemon
* side for custom logging -- they don't get sent over the socket. */
/* Log-message categories. FLOG and FCLIENT are only used on the daemon
* side for custom logging -- they don't get sent over the socket. */
@@
-311,6
+320,10
@@
enum msgcode {
#include <compat.h>
#endif
#include <compat.h>
#endif
+#ifdef HAVE_LIMITS_H
+# include <limits.h>
+#endif
+
#include <assert.h>
#include "lib/pool_alloc.h"
#include <assert.h>
#include "lib/pool_alloc.h"
@@
-455,6
+468,14
@@
struct idev {
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
+/* We want a roomy line buffer that can hold more than MAXPATHLEN,
+ * and significantly more than an overly short MAXPATHLEN. */
+#if MAXPATHLEN < 4096
+#define BIGPATHBUFLEN (4096+1024)
+#else
+#define BIGPATHBUFLEN (MAXPATHLEN+1024)
+#endif
+
#ifndef NAME_MAX
#define NAME_MAX 255
#endif
#ifndef NAME_MAX
#define NAME_MAX 255
#endif
@@
-473,7
+494,7
@@
struct idev {
#define HL_SKIP 1
struct hlink {
#define HL_SKIP 1
struct hlink {
-
struct file_struct *
next;
+
int
next;
int hlindex;
};
int hlindex;
};
@@
-666,8
+687,12
@@
extern char *sys_errlist[];
extern int errno;
#endif
extern int errno;
#endif
-#define SUPPORT_LINKS HAVE_READLINK
-#define SUPPORT_HARD_LINKS HAVE_LINK
+#ifdef HAVE_READLINK
+#define SUPPORT_LINKS 1
+#endif
+#ifdef HAVE_LINK
+#define SUPPORT_HARD_LINKS 1
+#endif
#define SIGNAL_CAST (RETSIGTYPE (*)())
#define SIGNAL_CAST (RETSIGTYPE (*)())