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
fix serious corruption bug
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
79ccc66
..
ce36018
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-23,9
+23,14
@@
#define RSYNC_NAME "rsync"
#define BACKUP_SUFFIX "~"
#define RSYNC_NAME "rsync"
#define BACKUP_SUFFIX "~"
+/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
+ imcompatible with older versions :-( */
+#define CHAR_OFFSET 0
+
+
#define FILE_VALID 1
#define SAME_MODE (1<<1)
#define FILE_VALID 1
#define SAME_MODE (1<<1)
-#define SAME_DEV (1<<2)
+#define SAME_
R
DEV (1<<2)
#define SAME_UID (1<<3)
#define SAME_GID (1<<4)
#define SAME_DIR (1<<5)
#define SAME_UID (1<<3)
#define SAME_GID (1<<4)
#define SAME_DIR (1<<5)
@@
-34,15
+39,20
@@
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
#define SAME_TIME (1<<7)
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 1
1
+#define PROTOCOL_VERSION 1
4
#define MIN_PROTOCOL_VERSION 10
#define MIN_PROTOCOL_VERSION 10
+#define MAX_PROTOCOL_VERSION 20
-/* block size to write files in */
-#define WRITE_BLOCK_SIZE (32*1024)
+#define SPARSE_WRITE_SIZE (4*1024)
+#define WRITE_SIZE (32*1024)
+#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (4*1024*1024)
#define BLOCKING_TIMEOUT 10
#define MAX_MAP_SIZE (4*1024*1024)
#define BLOCKING_TIMEOUT 10
+#define FERROR stderr
+#define FINFO (am_server?stderr:stdout)
+
#include "config.h"
#include <sys/types.h>
#include "config.h"
#include <sys/types.h>
@@
-55,9
+65,12
@@
#include <sys/param.h>
#endif
#include <sys/param.h>
#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <string.h>
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
#endif
#ifdef HAVE_COMPAT_H
#endif
#ifdef HAVE_COMPAT_H
@@
-109,7
+122,10
@@
#endif
#include <errno.h>
#endif
#include <errno.h>
+#ifdef HAVE_MMAP
#include <sys/mman.h>
#include <sys/mman.h>
+#endif
+
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
#ifdef HAVE_UTIME_H
#include <utime.h>
#endif
@@
-159,6
+175,7
@@
#endif
/* the length of the md4 checksum */
#endif
/* the length of the md4 checksum */
+#define MD4_SUM_LENGTH 16
#define SUM_LENGTH 16
#ifndef MAXPATHLEN
#define SUM_LENGTH 16
#ifndef MAXPATHLEN
@@
-169,13
+186,15
@@
struct file_struct {
time_t modtime;
off_t length;
mode_t mode;
time_t modtime;
off_t length;
mode_t mode;
+ ino_t inode;
dev_t dev;
dev_t dev;
+ dev_t rdev;
uid_t uid;
gid_t gid;
char *name;
char *dir;
char *link;
uid_t uid;
gid_t gid;
char *name;
char *dir;
char *link;
- char sum[SUM_LENGTH];
+ char sum[
MD4_
SUM_LENGTH];
};
struct file_list {
};
struct file_list {
@@
-189,7
+208,7
@@
struct sum_buf {
int len; /* length of chunk of file */
int i; /* index of this chunk */
uint32 sum1; /* simple checksum */
int len; /* length of chunk of file */
int i; /* index of this chunk */
uint32 sum1; /* simple checksum */
- char sum2[SUM_LENGTH]; /*
md4
checksum */
+ char sum2[SUM_LENGTH]; /* checksum */
};
struct sum_struct {
};
struct sum_struct {
@@
-200,6
+219,10
@@
struct sum_struct {
struct sum_buf *sums; /* points to info for each chunk */
};
struct sum_buf *sums; /* points to info for each chunk */
};
+struct map_struct {
+ char *map,*p;
+ int fd,size,p_size,p_offset,p_len;
+};
#include "byteorder.h"
#include "version.h"
#include "byteorder.h"
#include "version.h"
@@
-244,6
+267,11
@@
extern int errno;
#endif
#define SUPPORT_LINKS (HAVE_READLINK && defined(S_ISLNK))
#endif
#define SUPPORT_LINKS (HAVE_READLINK && defined(S_ISLNK))
+#define SUPPORT_HARD_LINKS HAVE_LINK
+
+#ifndef S_ISLNK
+#define S_ISLNK(x) 0
+#endif
#if !SUPPORT_LINKS
#define lstat stat
#if !SUPPORT_LINKS
#define lstat stat
@@
-256,3
+284,4
@@
extern int errno;
#endif
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
#endif
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
+