X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8de330a38717f8f808e8aa88a5f4391c310e7fd6..08f15335b5b469b29cbdacd0fc5ba48d76acf280:/rsync.h diff --git a/rsync.h b/rsync.h index dc58e691..9e7775c7 100644 --- a/rsync.h +++ b/rsync.h @@ -17,16 +17,22 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define False 0 +#define True 1 + #define BLOCK_SIZE 700 #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" #define RSYNCD_CONF "/etc/rsyncd.conf" +#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" +#define URL_PREFIX "rsync://" + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is - imcompatible with older versions :-( */ + incompatible with older versions :-( */ #define CHAR_OFFSET 0 @@ -41,7 +47,7 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 19 +#define PROTOCOL_VERSION 22 #define MIN_PROTOCOL_VERSION 11 #define MAX_PROTOCOL_VERSION 30 @@ -50,9 +56,8 @@ #define SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) -#define MAX_MAP_SIZE (1*1024*1024) +#define MAX_MAP_SIZE (256*1024) #define IO_BUFFER_SIZE (4092) -#define MAX_READ_BUFFER (1024*1024) #define MAX_ARGS 1000 @@ -61,6 +66,8 @@ #define FINFO 2 #define FLOG 3 +#include "errcode.h" + #include "config.h" #if HAVE_REMSH @@ -144,11 +151,6 @@ #endif #include -#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) -#include -#define USE_MMAP 1 -#endif - #ifdef HAVE_UTIME_H #include #endif @@ -227,6 +229,7 @@ #else /* I hope this works */ #define int32 int +#define LARGE_INT32 #endif #endif @@ -269,6 +272,10 @@ #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN 256 +#endif + /* the length of the md4 checksum */ #define MD4_SUM_LENGTH 16 #define SUM_LENGTH 16 @@ -277,6 +284,10 @@ #define MAXPATHLEN 1024 #endif +#ifndef PIPE_BUF +#define PIPE_BUF 512 +#endif + #ifndef INADDR_NONE #define INADDR_NONE 0xffffffff #endif @@ -298,6 +309,7 @@ struct file_struct { char *sum; }; + struct file_list { int count; int malloced; @@ -321,15 +333,16 @@ struct sum_struct { }; struct map_struct { - char *map,*p; + char *p; int fd,p_size,p_len; - OFF_T size, p_offset; + OFF_T file_size, p_offset, p_fd_offset; }; struct exclude_struct { char *orig; char *pattern; int regular_exp; + int fnmatch_flags; int include; int directory; int local; @@ -455,3 +468,32 @@ extern int errno; #ifndef ACCESSPERMS #define ACCESSPERMS 0777 #endif +/* Initial mask on permissions given to temporary files. Mask off setuid + bits and group access because of potential race-condition security + holes, and mask other access because mode 707 is bizarre */ +#define INITACCESSPERMS 0700 + +/* handler for null strings in printf format */ +#define NS(s) ((s)?(s):"") + +/* use magic gcc attributes to catch format errors */ + void rprintf(int , const char *, ...) +#ifdef __GNUC__ + __attribute__ ((format (printf, 2, 3))) +#endif +; + +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +#endif + + +#ifndef HAVE_STRLCPY +size_t strlcpy(char *d, const char *s, size_t bufsize); +#endif + +#ifndef HAVE_STRLCAT +size_t strlcat(char *d, const char *s, size_t bufsize); +#endif + +#define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__)