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
preparing for release of 2.0.12
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
62c0346
..
7e2967b
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-22,7
+22,6
@@
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
#define RSYNC_NAME "rsync"
#define RSYNCD_CONF "/etc/rsyncd.conf"
-#define RSYNCD_LOG "/var/adm/rsyncd.log"
#define BACKUP_SUFFIX "~"
#define BACKUP_SUFFIX "~"
@@
-42,7
+41,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
7
+#define PROTOCOL_VERSION 1
8
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
@@
-51,12
+50,15
@@
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define SPARSE_WRITE_SIZE (1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
-#define MAX_MAP_SIZE (4*1024*1024)
+#define MAX_MAP_SIZE (1*1024*1024)
+#define IO_BUFFER_SIZE (4096)
+#define MAX_READ_BUFFER (1024*1024)
-#define MAX_ARGS 100
+#define MAX_ARGS 100
0
#define BLOCKING_TIMEOUT 10
#define BLOCKING_TIMEOUT 10
+#define MPLEX_BASE 7
#define FERROR 1
#define FINFO 2
#define FERROR 1
#define FINFO 2
@@
-140,8
+142,9
@@
#endif
#include <errno.h>
#endif
#include <errno.h>
-#if
def HAVE_MMAP
+#if
defined(HAVE_MMAP) && defined(HAVE_MUNMAP)
#include <sys/mman.h>
#include <sys/mman.h>
+#define USE_MMAP 1
#endif
#ifdef HAVE_UTIME_H
#endif
#ifdef HAVE_UTIME_H
@@
-171,6
+174,10
@@
#include "lib/getopt.h"
#endif
#include "lib/getopt.h"
#endif
+#ifdef HAVE_GLOB
+#include <glob.h>
+#endif
+
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
/* these are needed for the uid/gid mapping code */
#include <pwd.h>
#include <grp.h>
@@
-179,6
+186,8
@@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <syslog.h>
+#include <sys/file.h>
#ifndef S_IFLNK
#define S_IFLNK 0120000
#ifndef S_IFLNK
#define S_IFLNK 0120000
@@
-251,6
+260,10
@@
#define MAXPATHLEN 1024
#endif
#define MAXPATHLEN 1024
#endif
+#ifndef INADDR_NONE
+#define INADDR_NONE 0xffffffff
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
struct file_struct {
unsigned flags;
time_t modtime;