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 redefinition of MAX
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
82ac323
..
f98ca6a
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-21,6
+21,8
@@
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
+#define RSYNCD_CONF "/etc/rsyncd.conf"
+
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
#define BACKUP_SUFFIX "~"
/* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is
@@
-39,19
+41,26
@@
#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
+#define RSYNC_PORT 873
+
#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 1000
#define BLOCKING_TIMEOUT 10
#define BLOCKING_TIMEOUT 10
-#define FERROR stderr
-#define FINFO (am_server?stderr:stdout)
+#define MPLEX_BASE 7
+#define FERROR 1
+#define FINFO 2
#include "config.h"
#include "config.h"
@@
-66,6
+75,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>
@@
-163,10
+173,21
@@
#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>
+#include <stdarg.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
#endif
#ifndef S_IFLNK
#define S_IFLNK 0120000
#endif
@@
-175,10
+196,18
@@
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
#endif
#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK)
#endif
+#define BOOL int
+
#ifndef uchar
#define uchar unsigned char
#endif
#ifndef uchar
#define uchar unsigned char
#endif
+#if HAVE_UNSIGNED_CHAR
+#define schar signed char
+#else
+#define schar char
+#endif
+
#ifndef int32
#if (SIZEOF_INT == 4)
#define int32 int
#ifndef int32
#if (SIZEOF_INT == 4)
#define int32 int
@@
-193,10
+222,25
@@
#define uint32 unsigned int32
#endif
#define uint32 unsigned int32
#endif
-#ifdef HAVE_LONGLONG
+#if HAVE_OFF64_T
+#define OFF_T off64_t
+#define STRUCT_STAT struct stat64
+#else
+#define OFF_T off_t
+#define STRUCT_STAT struct stat
+#endif
+
+#if HAVE_OFF64_T
+#define int64 off64_t
+#elif (SIZEOF_LONG == 8)
+#define int64 long
+#elif (SIZEOF_INT == 8)
+#define int64 int
+#elif HAVE_LONGLONG
#define int64 long long
#else
#define int64 off_t
#define int64 long long
#else
#define int64 off_t
+#define NO_INT64
#endif
#ifndef MIN
#endif
#ifndef MIN
@@
-215,10
+259,14
@@
#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;
-
off_t
length;
+
OFF_T
length;
mode_t mode;
ino_t inode;
dev_t dev;
mode_t mode;
ino_t inode;
dev_t dev;
@@
-239,7
+287,7
@@
struct file_list {
};
struct sum_buf {
};
struct sum_buf {
-
off_t
offset; /* offset in file of this chunk */
+
OFF_T
offset; /* offset in file of this chunk */
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 */
@@
-247,7
+295,7
@@
struct sum_buf {
};
struct sum_struct {
};
struct sum_struct {
-
off_t
flength; /* total file length */
+
OFF_T
flength; /* total file length */
int count; /* how many chunks */
int remainder; /* flength % block_length */
int n; /* block_length */
int count; /* how many chunks */
int remainder; /* flength % block_length */
int n; /* block_length */
@@
-257,7
+305,7
@@
struct sum_struct {
struct map_struct {
char *map,*p;
int fd,p_size,p_len;
struct map_struct {
char *map,*p;
int fd,p_size,p_len;
-
off_t
size, p_offset;
+
OFF_T
size, p_offset;
};
/* we need this function because of the silly way in which duplicate
};
/* we need this function because of the silly way in which duplicate
@@
-269,6
+317,20
@@
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 "byteorder.h"
#include "version.h"
@@
-285,21
+347,6
@@
extern char *sys_errlist[];
# define strrchr rindex
#endif
# define strrchr rindex
#endif
-#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
-
#ifndef HAVE_ERRNO_DECL
extern int errno;
#endif
#ifndef HAVE_ERRNO_DECL
extern int errno;
#endif