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
bugfix from Kenji Miyake <kenjim@fix.co.jp>
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
98d801c
..
9790c7c
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-19,10
+19,15
@@
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define BLOCK_SIZE 700
#define RSYNC_RSH_ENV "RSYNC_RSH"
-#define RSYNC_RSH "rsh"
+
#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 SAME_RDEV (1<<2)
#define FILE_VALID 1
#define SAME_MODE (1<<1)
#define SAME_RDEV (1<<2)
@@
-34,7
+39,7
@@
#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
2
+#define PROTOCOL_VERSION 1
4
#define MIN_PROTOCOL_VERSION 10
#define MAX_PROTOCOL_VERSION 20
#define MIN_PROTOCOL_VERSION 10
#define MAX_PROTOCOL_VERSION 20
@@
-50,6
+55,12
@@
#include "config.h"
#include "config.h"
+#if HAVE_REMSH
+#define RSYNC_RSH "remsh"
+#else
+#define RSYNC_RSH "rsh"
+#endif
+
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@
-60,9
+71,16
@@
#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_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+
+#ifdef HAVE_STRING_H
+#include <string.h>
#endif
#ifdef HAVE_COMPAT_H
#endif
#ifdef HAVE_COMPAT_H
@@
-122,6
+140,15
@@
#include <utime.h>
#endif
#include <utime.h>
#endif
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#ifdef HAVE_SYS_MODE_H
+/* apparently AIX needs this for S_ISLNK */
+#include <sys/mode.h>
+#endif
+
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
#else
#ifdef HAVE_FNMATCH
#include <fnmatch.h>
#else
@@
-167,6
+194,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
@@
-185,7
+213,7
@@
struct file_struct {
char *name;
char *dir;
char *link;
char *name;
char *dir;
char *link;
- char sum[SUM_LENGTH];
+ char sum[
MD4_
SUM_LENGTH];
};
struct file_list {
};
struct file_list {
@@
-199,7
+227,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 {
@@
-210,6
+238,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"
@@
-264,11
+296,31
@@
extern int errno;
#define lstat stat
#endif
#define lstat stat
#endif
+#ifndef HAVE_LCHOWN
+#define lchown chown
+#endif
+
#define SIGNAL_CAST (RETSIGTYPE (*)())
#ifndef EWOULDBLOCK
#define EWOULDBLOCK EAGAIN
#endif
#define SIGNAL_CAST (RETSIGTYPE (*)())
#ifndef EWOULDBLOCK
#define EWOULDBLOCK EAGAIN
#endif
+#ifndef STDIN_FILENO
+#define STDIN_FILENO 0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO 1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO 2
+#endif
+
+#ifndef S_IWUSR
+#define S_IWUSR 0200
+#endif
+
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode))