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
c442a28
..
deb20a2
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-51,13
+51,11
@@
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (1*1024*1024)
#define WRITE_SIZE (32*1024)
#define CHUNK_SIZE (32*1024)
#define MAX_MAP_SIZE (1*1024*1024)
-#define IO_BUFFER_SIZE (409
6
)
+#define IO_BUFFER_SIZE (409
2
)
#define MAX_READ_BUFFER (1024*1024)
#define MAX_ARGS 1000
#define MAX_READ_BUFFER (1024*1024)
#define MAX_ARGS 1000
-#define BLOCKING_TIMEOUT 10
-
#define MPLEX_BASE 7
#define FERROR 1
#define FINFO 2
#define MPLEX_BASE 7
#define FERROR 1
#define FINFO 2
@@
-93,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
@@
-189,6
+183,26
@@
#include <syslog.h>
#include <sys/file.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
#endif
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
@@
-282,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 {
@@
-318,6
+332,18
@@
struct exclude_struct {
int local;
};
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
/* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this
@@
-328,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"
@@
-362,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
@@
-434,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