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
- only keep a partial file if some literal data has been transferred,
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
e2d7745
..
deb20a2
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
9
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
#define MIN_PROTOCOL_VERSION 11
#define MAX_PROTOCOL_VERSION 30
@@
-51,12
+50,13
@@
#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 (4092)
+#define MAX_READ_BUFFER (1024*1024)
-#define MAX_ARGS 100
-
-#define BLOCKING_TIMEOUT 10
+#define MAX_ARGS 1000
+#define MPLEX_BASE 7
#define FERROR 1
#define FINFO 2
#define FERROR 1
#define FINFO 2
@@
-73,6
+73,7
@@
#include <unistd.h>
#endif
#include <stdio.h>
#include <unistd.h>
#endif
#include <stdio.h>
+#include <stddef.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
#ifdef HAVE_SYS_PARAM_H
#include <sys/param.h>
@@
-90,10
+91,6
@@
#include <string.h>
#endif
#include <string.h>
#endif
-#ifdef HAVE_COMPAT_H
-#include <compat.h>
-#endif
-
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
@@
-139,8
+136,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
@@
-170,6
+168,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>
@@
-178,6
+180,28
@@
#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>
+
+#if HAVE_DIRENT_H
+# include <dirent.h>
+#else
+# define dirent direct
+# if HAVE_SYS_NDIR_H
+# include <sys/ndir.h>
+# endif
+# if HAVE_SYS_DIR_H
+# include <sys/dir.h>
+# endif
+# if HAVE_NDIR_H
+# include <ndir.h>
+# endif
+#endif
+
+#ifdef HAVE_COMPAT_H
+#include <compat.h>
+#endif
+
#ifndef S_IFLNK
#define S_IFLNK 0120000
#ifndef S_IFLNK
#define S_IFLNK 0120000
@@
-250,6
+274,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;
@@
-268,9
+296,9
@@
struct file_struct {
};
struct file_list {
};
struct file_list {
- int count;
- int malloced;
- struct file_struct **files;
+
int count;
+
int malloced;
+
struct file_struct **files;
};
struct sum_buf {
};
struct sum_buf {
@@
-295,6
+323,28
@@
struct map_struct {
OFF_T size, p_offset;
};
OFF_T size, p_offset;
};
+struct exclude_struct {
+ char *orig;
+ char *pattern;
+ int regular_exp;
+ int include;
+ int directory;
+ int local;
+};
+
+struct stats {
+ int64 total_size;
+ int64 total_transferred_size;
+ int64 total_written;
+ int64 total_read;
+ int64 literal_data;
+ int64 matched_data;
+ int flist_size;
+ int num_files;
+ int num_transferred_files;
+};
+
+
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
without breaking existing versions */
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
without breaking existing versions */
@@
-304,21
+354,6
@@
static inline int flist_up(struct file_list *flist, int i)
return i;
}
return i;
}
-#if HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-# include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-# include <ndir.h>
-# endif
-#endif
-
#include "byteorder.h"
#include "version.h"
#include "proto.h"
#include "byteorder.h"
#include "version.h"
#include "proto.h"
@@
-338,14
+373,6
@@
extern char *sys_errlist[];
extern int errno;
#endif
extern int errno;
#endif
-#ifndef HAVE_BCOPY
-#define bcopy(src,dest,n) memcpy(dest,src,n)
-#endif
-
-#ifndef HAVE_BZERO
-#define bzero(buf,n) memset(buf,0,n)
-#endif
-
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
#define SUPPORT_LINKS HAVE_READLINK
#define SUPPORT_HARD_LINKS HAVE_LINK
@@
-410,3
+437,6
@@
extern int errno;
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode))
+#ifndef ACCESSPERMS
+#define ACCESSPERMS 0777
+#endif