X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fdd71e177db1a15f46d3d3c92c154a1ddc07f9fd..654175798bdbdd6403e10c8fa74e8586b3612ea1:/rsync.h diff --git a/rsync.h b/rsync.h index 9790c7ce..e11b84a0 100644 --- a/rsync.h +++ b/rsync.h @@ -21,6 +21,10 @@ #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" +#define RSYNCD_CONF "/etc/rsyncd.conf" + +#define URL_PREFIX "rsync://" + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -28,7 +32,7 @@ #define CHAR_OFFSET 0 -#define FILE_VALID 1 +#define FLAG_DELETE (1<<0) #define SAME_MODE (1<<1) #define SAME_RDEV (1<<2) #define SAME_UID (1<<3) @@ -39,19 +43,27 @@ #define SAME_TIME (1<<7) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 14 -#define MIN_PROTOCOL_VERSION 10 -#define MAX_PROTOCOL_VERSION 20 +#define PROTOCOL_VERSION 19 +#define MIN_PROTOCOL_VERSION 11 +#define MAX_PROTOCOL_VERSION 30 -#define SPARSE_WRITE_SIZE (4*1024) +#define RSYNC_PORT 873 + +#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 1000 -#define BLOCKING_TIMEOUT 10 +#define MPLEX_BASE 7 +#define FERROR 1 +#define FINFO 2 +#define FLOG 3 -#define FERROR stderr -#define FINFO (am_server?stderr:stdout) +#include "errcode.h" #include "config.h" @@ -62,10 +74,18 @@ #endif #include + +#ifdef HAVE_GETOPT_LONG +#include +#else +#include "lib/getopt.h" +#endif + #ifdef HAVE_UNISTD_H #include #endif #include +#include #ifdef HAVE_SYS_PARAM_H #include @@ -83,10 +103,6 @@ #include #endif -#ifdef HAVE_COMPAT_H -#include -#endif - #ifdef HAVE_MALLOC_H #include #endif @@ -132,8 +148,9 @@ #endif #include -#ifdef HAVE_MMAP +#if defined(HAVE_MMAP) && defined(HAVE_MUNMAP) #include +#define USE_MMAP 1 #endif #ifdef HAVE_UTIME_H @@ -146,8 +163,10 @@ #ifdef HAVE_SYS_MODE_H /* apparently AIX needs this for S_ISLNK */ +#ifndef S_ISLNK #include #endif +#endif #ifdef HAVE_FNMATCH #include @@ -155,21 +174,53 @@ #include "lib/fnmatch.h" #endif -#ifdef HAVE_GETOPT_LONG -#include -#else -#include "lib/getopt.h" +#ifdef HAVE_GLOB_H +#include #endif +/* these are needed for the uid/gid mapping code */ +#include +#include + +#include +#include +#include +#include +#include +#include -#ifndef S_ISLNK -#define S_ISLNK(mode) (((mode) & S_IFLNK) == S_IFLNK) +#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 +#ifdef HAVE_COMPAT_H +#include +#endif + + +#define BOOL int + #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 @@ -177,6 +228,10 @@ #define int32 long #elif (SIZEOF_SHORT == 4) #define int32 short +#else +/* I hope this works */ +#define int32 int +#define LARGE_INT32 #endif #endif @@ -184,6 +239,32 @@ #define uint32 unsigned int32 #endif +#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 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)) @@ -201,37 +282,43 @@ #define MAXPATHLEN 1024 #endif +#ifndef INADDR_NONE +#define INADDR_NONE 0xffffffff +#endif + struct file_struct { - time_t modtime; - off_t length; - mode_t mode; - ino_t inode; - dev_t dev; - dev_t rdev; - uid_t uid; - gid_t gid; - char *name; - char *dir; - char *link; - char sum[MD4_SUM_LENGTH]; + unsigned flags; + time_t modtime; + OFF_T length; + mode_t mode; + INO_T inode; + dev_t dev; + dev_t rdev; + uid_t uid; + gid_t gid; + char *basename; + char *dirname; + char *basedir; + char *link; + 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 { - 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 */ @@ -239,14 +326,46 @@ struct sum_struct { }; struct map_struct { - char *map,*p; - int fd,size,p_size,p_offset,p_len; + char *map,*p; + int fd,p_size,p_len; + 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 */ +static inline int flist_up(struct file_list *flist, int i) +{ + while (!flist->files[i]->basename) i++; + return i; +} + #include "byteorder.h" #include "version.h" #include "proto.h" -#include "md4.h" +#include "lib/mdfour.h" #if !HAVE_STRERROR extern char *sys_errlist[]; @@ -258,44 +377,13 @@ extern char *sys_errlist[]; # define strrchr rindex #endif -#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 HAVE_ERRNO_DECL 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 && defined(S_ISLNK)) +#define SUPPORT_LINKS HAVE_READLINK #define SUPPORT_HARD_LINKS HAVE_LINK -#ifndef S_ISLNK -#define S_ISLNK(x) 0 -#endif - -#if !SUPPORT_LINKS -#define lstat stat -#endif - #ifndef HAVE_LCHOWN #define lchown chown #endif @@ -322,5 +410,67 @@ extern int errno; #define S_IWUSR 0200 #endif -#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) +#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 +#ifndef S_ISCHR +#define S_ISCHR(mode) (((mode) & (_S_IFMT)) == (_S_IFCHR)) +#endif + +#ifndef S_ISSOCK +#ifdef _S_IFSOCK +#define S_ISSOCK(mode) (((mode) & (_S_IFMT)) == (_S_IFSOCK)) +#else +#define S_ISSOCK(mode) (0) +#endif +#endif + +#ifndef S_ISFIFO +#ifdef _S_IFIFO +#define S_ISFIFO(mode) (((mode) & (_S_IFMT)) == (_S_IFIFO)) +#else +#define S_ISFIFO(mode) (0) +#endif +#endif + +#ifndef S_ISDIR +#define S_ISDIR(mode) (((mode) & (_S_IFMT)) == (_S_IFDIR)) +#endif + +#ifndef S_ISREG +#define S_ISREG(mode) (((mode) & (_S_IFMT)) == (_S_IFREG)) +#endif + + +#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) + +#ifndef ACCESSPERMS +#define ACCESSPERMS 0777 +#endif + +/* 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