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
Call finish_transfer() with its new arg.
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
d66657a
..
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,10
+110,22
@@
#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 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. */
@@
-120,10
+134,10
@@
enum logcode { FERROR=1, FINFO=2, FLOG=3 };
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
enum msgcode {
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
enum msgcode {
- MSG_DATA=0, /* raw data on the multiplexed stream */
- MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
- MSG_REDO=4, /* reprocess indicated flist index */
MSG_DONE=5, /* current phase is done */
MSG_DONE=5, /* current phase is done */
+ MSG_REDO=4, /* reprocess indicated flist index */
+ MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
+ MSG_DATA=0 /* raw data on the multiplexed stream */
};
#include "errcode.h"
};
#include "errcode.h"
@@
-248,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
@@
-309,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)
@@
-388,7
+405,7
@@
struct idev {
#define IN_LOOPBACKNET 127
#endif
#define IN_LOOPBACKNET 127
#endif
-#define GID_NONE (
gid_t) -1
+#define GID_NONE (
(gid_t)-1)
#define HL_CHECK_MASTER 0
#define HL_SKIP 1
#define HL_CHECK_MASTER 0
#define HL_SKIP 1
@@
-455,19
+472,21
@@
struct file_list {
struct file_struct **files;
};
struct file_struct **files;
};
+#define SUMFLG_SAME_OFFSET (1<<0)
+
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 */
- int i; /**< index of this chunk */
+ int32 len; /**< length of chunk of file */
uint32 sum1; /**< simple checksum */
uint32 sum1; /**< simple checksum */
+ short flags; /**< flag bits */
char sum2[SUM_LENGTH]; /**< checksum */
};
struct sum_struct {
OFF_T flength; /**< total file length */
size_t count; /**< how many chunks */
char sum2[SUM_LENGTH]; /**< checksum */
};
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 */
};
@@
-475,11
+494,9
@@
struct sum_struct {
struct map_struct {
char *p; /* Window pointer */
int fd; /* File Descriptor */
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 */
int status; /* first errno from read errors */
OFF_T file_size; /* File size (from stat) */
OFF_T p_offset; /* Window start */
@@
-490,12
+507,13
@@
struct map_struct {
#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */
#define MATCHFLG_ABS_PATH (1<<3) /* path-match on absolute path */
#define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */
#define MATCHFLG_ABS_PATH (1<<3) /* path-match on absolute path */
+#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */
+#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */
+#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */
struct exclude_struct {
struct exclude_struct *next;
char *pattern;
struct exclude_struct {
struct exclude_struct *next;
char *pattern;
- int match_flags;
- int include;
- int directory;
+ unsigned int match_flags;
int slash_cnt;
};
int slash_cnt;
};
@@
-573,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