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
For the "unexpected tag" or "multiplexing overflow" messages, we
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b530842
..
c753098
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-98,6
+98,8
@@
#define MAX_ARGS 1000
#define MAX_ARGS 1000
+#define MAX_BASIS_DIRS 20
+
#define MPLEX_BASE 7
#define NO_EXCLUDES 0
#define MPLEX_BASE 7
#define NO_EXCLUDES 0
@@
-108,6
+110,7
@@
#define XFLG_DEF_INCLUDE (1<<1)
#define XFLG_WORDS_ONLY (1<<2)
#define XFLG_WORD_SPLIT (1<<3)
#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)
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
@@
-115,6
+118,14
@@
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
+#define PDIR_CREATE 1
+#define PDIR_DELETE 0
+
+#define FNAMECMP_BASIS_DIR 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. */
/* Log-message categories. FLOG is only used on the daemon side to
* output messages to the log file. */
@@
-251,6
+262,9
@@
enum msgcode {
#if MAJOR_IN_MKDEV
#include <sys/mkdev.h>
#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
#elif MAJOR_IN_SYSMACROS
#include <sys/sysmacros.h>
#endif
@@
-312,7
+326,7
@@
enum msgcode {
#else
/* As long as it gets... */
#define int64 off_t
#else
/* As long as it gets... */
#define int64 off_t
-#define
NO_INT64
+#define
INT64_IS_OFF_T
#endif
#if (SIZEOF_LONG == 8)
#endif
#if (SIZEOF_LONG == 8)
@@
-462,7
+476,7
@@
struct file_list {
struct sum_buf {
OFF_T offset; /**< offset in file of this chunk */
struct sum_buf {
OFF_T offset; /**< offset in file of this chunk */
-
unsigned int len;
/**< length of chunk of file */
+
int32 len;
/**< length of chunk of file */
uint32 sum1; /**< simple checksum */
short flags; /**< flag bits */
char sum2[SUM_LENGTH]; /**< checksum */
uint32 sum1; /**< simple checksum */
short flags; /**< flag bits */
char sum2[SUM_LENGTH]; /**< checksum */
@@
-471,8
+485,8
@@
struct sum_buf {
struct sum_struct {
OFF_T flength; /**< total file length */
size_t count; /**< how many chunks */
struct sum_struct {
OFF_T flength; /**< total file length */
size_t count; /**< how many chunks */
-
unsigned int blength;
/**< block_length */
-
unsigned int remainder;
/**< flength % block_length */
+
int32 blength;
/**< block_length */
+
int32 remainder;
/**< flength % block_length */
int s2length; /**< sum2_length */
struct sum_buf *sums; /**< points to info for each chunk */
};
int s2length; /**< sum2_length */
struct sum_buf *sums; /**< points to info for each chunk */
};
@@
-577,13
+591,6
@@
extern int errno;
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
-/* This could be bad on systems which have no lchown and where chown
- * follows symbollic links. On such systems it might be better not to
- * try to chown symlinks at all. */
-#ifndef HAVE_LCHOWN
-#define lchown chown
-#endif
-
#define SIGNAL_CAST (RETSIGTYPE (*)())
#ifndef EWOULDBLOCK
#define SIGNAL_CAST (RETSIGTYPE (*)())
#ifndef EWOULDBLOCK