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
Got rid of an unneeded assert().
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
b417ba6
..
80fd137
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
@@
-119,7
+121,9
@@
#define PDIR_CREATE 1
#define PDIR_DELETE 0
#define PDIR_CREATE 1
#define PDIR_DELETE 0
-#define FNAMECMP_CMPDEST 0x00
+/* Note: 0x00 - 0x7F are used for basis_dir[] indexes! */
+#define FNAMECMP_BASIS_DIR_LOW 0x00 /* Must remain 0! */
+#define FNAMECMP_BASIS_DIR_HIGH 0x7F
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_FNAME 0x80
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
@@
-474,7
+478,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 */
@@
-483,8
+487,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 */
};
@@
-589,13
+593,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