X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2b6b4d539b0aab98b1cbb9d8c639cb12473aae94..f0359dd00d60d72c4b3dec85de8e490692f6015c:/rsync.h diff --git a/rsync.h b/rsync.h index c442a281..f9f0fd4f 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,8 +47,8 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 19 -#define MIN_PROTOCOL_VERSION 11 +#define PROTOCOL_VERSION 24 +#define MIN_PROTOCOL_VERSION 15 #define MAX_PROTOCOL_VERSION 30 #define RSYNC_PORT 873 @@ -50,17 +56,16 @@ #define SPARSE_WRITE_SIZE (1024) #define WRITE_SIZE (32*1024) #define CHUNK_SIZE (32*1024) -#define MAX_MAP_SIZE (1*1024*1024) -#define IO_BUFFER_SIZE (4096) -#define MAX_READ_BUFFER (1024*1024) +#define MAX_MAP_SIZE (256*1024) +#define IO_BUFFER_SIZE (4092) #define MAX_ARGS 1000 -#define BLOCKING_TIMEOUT 10 - #define MPLEX_BASE 7 -#define FERROR 1 -#define FINFO 2 + +enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3}; + +#include "errcode.h" #include "config.h" @@ -71,6 +76,13 @@ #endif #include + +#ifdef HAVE_GETOPT_LONG +#include +#else +#include "lib/getopt.h" +#endif + #ifdef HAVE_UNISTD_H #include #endif @@ -93,10 +105,6 @@ #include #endif -#ifdef HAVE_COMPAT_H -#include -#endif - #ifdef HAVE_MALLOC_H #include #endif @@ -142,11 +150,6 @@ #endif #include -#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) -#include -#define USE_MMAP 1 -#endif - #ifdef HAVE_UTIME_H #include #endif @@ -168,13 +171,7 @@ #include "lib/fnmatch.h" #endif -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" -#endif - -#ifdef HAVE_GLOB +#ifdef HAVE_GLOB_H #include #endif @@ -189,14 +186,26 @@ #include #include -#ifndef S_IFLNK -#define S_IFLNK 0120000 +#if HAVE_DIRENT_H +# include +#else +# define dirent direct +# if HAVE_SYS_NDIR_H +# include +# endif +# if HAVE_SYS_DIR_H +# include +# endif +# if HAVE_NDIR_H +# include +# endif #endif -#ifndef S_ISLNK -#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) +#ifdef HAVE_COMPAT_H +#include #endif + #define BOOL int #ifndef uchar @@ -216,6 +225,10 @@ #define int32 long #elif (SIZEOF_SHORT == 4) #define int32 short +#else +/* I hope this works */ +#define int32 int +#define LARGE_INT32 #endif #endif @@ -244,6 +257,12 @@ #define NO_INT64 #endif +#if HAVE_SHORT_INO_T +#define INO_T uint32 +#else +#define INO_T ino_t +#endif + #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif @@ -252,6 +271,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 @@ -269,7 +292,7 @@ struct file_struct { time_t modtime; OFF_T length; mode_t mode; - ino_t inode; + INO_T inode; dev_t dev; dev_t rdev; uid_t uid; @@ -281,18 +304,19 @@ struct file_struct { char *sum; }; + struct file_list { - int count; - int malloced; - struct file_struct **files; + int count; + int malloced; + struct file_struct **files; }; struct sum_buf { - 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 */ - char sum2[SUM_LENGTH]; /* checksum */ + 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 */ + char sum2[SUM_LENGTH]; /* checksum */ }; struct sum_struct { @@ -304,20 +328,33 @@ 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; }; +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 @@ -328,25 +365,10 @@ static inline int flist_up(struct file_list *flist, int i) return i; } -#if HAVE_DIRENT_H -# include -#else -# define dirent direct -# if HAVE_SYS_NDIR_H -# include -# endif -# if HAVE_SYS_DIR_H -# include -# endif -# if HAVE_NDIR_H -# include -# endif -#endif - #include "byteorder.h" #include "version.h" #include "proto.h" -#include "md4.h" +#include "lib/mdfour.h" #if !HAVE_STRERROR extern char *sys_errlist[]; @@ -362,14 +384,6 @@ extern char *sys_errlist[]; 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 @@ -399,6 +413,18 @@ extern int errno; #define S_IWUSR 0200 #endif +#ifndef _S_IFMT +#define _S_IFMT 0170000 +#endif + +#ifndef _S_IFLNK +#define _S_IFLNK 0120000 +#endif + +#ifndef S_ISLNK +#define S_ISLNK(mode) (((mode) & (_S_IFMT)) == (_S_IFLNK)) +#endif + #ifndef S_ISBLK #define S_ISBLK(mode) (((mode) & (_S_IFMT)) == (_S_IFBLK)) #endif @@ -431,6 +457,47 @@ extern int errno; #define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) #endif +/* work out what fcntl flag to use for non-blocking */ +#ifdef O_NONBLOCK +# define NONBLOCK_FLAG O_NONBLOCK +#elif defined(SYSV) +# define NONBLOCK_FLAG O_NDELAY +#else +# define NONBLOCK_FLAG FNDELAY +#endif + #define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) +#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(enum logcode , 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__)