X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/d622d4bf30c3acd56bb6b3832643ef95d1cbd4cb..fe1c19dcdfa000c2461e85ed7bf712de49904377:/rsync.h diff --git a/rsync.h b/rsync.h index dd5a0860..75e3a26b 100644 --- a/rsync.h +++ b/rsync.h @@ -41,7 +41,7 @@ /* These flags are only used during the flist transfer. */ -#define XMIT_DEL_START (1<<0) +#define XMIT_TOP_DIR (1<<0) #define XMIT_SAME_MODE (1<<1) #define XMIT_EXTENDED_FLAGS (1<<2) #define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */ @@ -57,9 +57,10 @@ /* These flags are used in the live flist data. */ -#define FLAG_DEL_START (1<<0) +#define FLAG_TOP_DIR (1<<0) #define FLAG_HLINK_EOL (1<<1) /* generator only */ #define FLAG_MOUNT_POINT (1<<2) /* sender only */ +#define FLAG_DEL_HERE (1<<3) /* receiver/generator */ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 29 @@ -108,12 +109,8 @@ #define ALL_FILTERS 2 #define XFLG_FATAL_ERRORS (1<<0) -#define XFLG_DEF_INCLUDE (1<<1) -#define XFLG_DEF_EXCLUDE (1<<2) -#define XFLG_WORD_SPLIT (1<<3) -#define XFLG_DIRECTORY (1<<4) -#define XFLG_NO_PREFIXES (1<<5) -#define XFLG_ABS_PATH (1<<6) +#define XFLG_OLD_PREFIXES (1<<1) +#define XFLG_ANCHORED2ABS (1<<2) #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -157,91 +154,101 @@ enum msgcode { /* The default RSYNC_RSH is always set in config.h. */ -#include - -#ifdef HAVE_UNISTD_H -#include -#endif #include -#include - -#ifdef HAVE_SYS_PARAM_H -#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_UNISTD_H +# include #endif -#ifdef HAVE_STDLIB_H -#include +#if HAVE_SYS_PARAM_H +#include #endif -#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H)) +#if HAVE_MALLOC_H && (HAVE_MALLINFO || !HAVE_STDLIB_H) #include #endif -#ifdef HAVE_SYS_SOCKET_H +#if HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef TIME_WITH_SYS_TIME +#if TIME_WITH_SYS_TIME #include #include #else -#ifdef HAVE_SYS_TIME_H +#if HAVE_SYS_TIME_H #include #else #include #endif #endif -#ifdef HAVE_FCNTL_H +#if HAVE_FCNTL_H #include #else -#ifdef HAVE_SYS_FCNTL_H +#if HAVE_SYS_FCNTL_H #include #endif #endif -#include - -#ifdef HAVE_SYS_IOCTL_H +#if HAVE_SYS_IOCTL_H #include #endif -#ifdef HAVE_SYS_FILIO_H +#if HAVE_SYS_FILIO_H #include #endif #include -#ifdef HAVE_SYS_WAIT_H +#if HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_CTYPE_H +#if HAVE_CTYPE_H #include #endif -#ifdef HAVE_GRP_H +#if HAVE_GRP_H #include #endif #include -#ifdef HAVE_UTIME_H +#if HAVE_UTIME_H #include #endif -#ifdef HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_MODE_H +#if HAVE_SYS_MODE_H /* apparently AIX needs this for S_ISLNK */ #ifndef S_ISLNK #include #endif #endif -#ifdef HAVE_GLOB_H +#if HAVE_GLOB_H #include #endif @@ -280,7 +287,7 @@ enum msgcode { #include #endif -#ifdef HAVE_COMPAT_H +#if HAVE_COMPAT_H #include #endif @@ -300,30 +307,43 @@ enum msgcode { #define schar char #endif +/* Find a variable that is either exactly 32-bits or longer. + * If some code depends on 32-bit truncation, it will need to + * take special action in a "#if SIZEOF_INT32 > 4" section. */ #ifndef int32 -#if (SIZEOF_INT == 4) -#define int32 int -#elif (SIZEOF_LONG == 4) -#define int32 long -#elif (SIZEOF_SHORT == 4) -#define int32 short +#if SIZEOF_INT == 4 +# define int32 int +# define SIZEOF_INT32 4 +#elif SIZEOF_LONG == 4 +# define int32 long +# define SIZEOF_INT32 4 +#elif SIZEOF_SHORT == 4 +# define int32 short +# define SIZEOF_INT32 4 +#elif SIZEOF_INT > 4 +# define int32 int +# define SIZEOF_INT32 SIZEOF_INT +#elif SIZEOF_LONG > 4 +# define int32 long +# define SIZEOF_INT32 SIZEOF_LONG #else -/* I hope this works */ -#define int32 int -#define LARGE_INT32 +# error Could not find a 32-bit integer variable #endif +#else +# define SIZEOF_INT32 4 #endif #ifndef uint32 #define uint32 unsigned int32 #endif -#if HAVE_OFF64_T -#define OFF_T off64_t -#define STRUCT_STAT struct stat64 -#else +#if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !HAVE_STRUCT_STAT64 #define OFF_T off_t #define STRUCT_STAT struct stat +#else +#define OFF_T off64_t +#define STRUCT_STAT struct stat64 +#define USE_STAT64_FUNCS 1 #endif /* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF @@ -450,9 +470,12 @@ struct file_struct { char *link; /* Points to symlink string, if a symlink */ } u; OFF_T length; - char *basename; - char *dirname; - char *basedir; + char *basename; /* The current item's name (AKA filename) */ + char *dirname; /* The directory info inside the transfer */ + union { + char *root; /* Sender-side dir info outside transfer */ + int depth; /* Receiver-side directory depth info */ + } dir; union { struct idev *idev; struct hlink *links; @@ -492,6 +515,7 @@ struct file_list { alloc_pool_t hlink_pool; int count; int malloced; + int low, high; }; #define SUMFLG_SAME_OFFSET (1<<0) @@ -539,10 +563,19 @@ struct map_struct { #define MATCHFLG_PERDIR_MERGE (1<<11)/* merge-file is searched per-dir */ #define MATCHFLG_EXCLUDE_SELF (1<<12)/* merge-file name should be excluded */ #define MATCHFLG_FINISH_SETUP (1<<13)/* per-dir merge file needs setup */ +#define MATCHFLG_NEGATE (1<<14)/* rule matches when pattern does not */ +#define MATCHFLG_CVS_IGNORE (1<<15)/* rule was -C or :C */ +#define MATCHFLG_SENDER_SIDE (1<<16)/* rule applies to the sending side */ +#define MATCHFLG_RECEIVER_SIDE (1<<17)/* rule applies to the receiving side */ + +#define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \ + | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \ + | MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE) + struct filter_struct { struct filter_struct *next; char *pattern; - unsigned int match_flags; + uint32 match_flags; union { int slash_cnt; struct filter_list_struct *mergelist; @@ -571,15 +604,6 @@ struct stats { }; -/* 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 "lib/mdfour.h" #include "lib/wildmatch.h" @@ -589,20 +613,20 @@ static inline int flist_up(struct file_list *flist, int i) #include "proto.h" /* We have replacement versions of these if they're missing. */ -#ifndef HAVE_ASPRINTF +#if !HAVE_ASPRINTF int asprintf(char **ptr, const char *format, ...); #endif -#ifndef HAVE_VASPRINTF +#if !HAVE_VASPRINTF int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_VSNPRINTF || !HAVE_C99_VSNPRINTF #define vsnprintf rsync_vsnprintf int vsnprintf(char *str, size_t count, const char *fmt, va_list args); #endif -#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_SNPRINTF || !HAVE_C99_VSNPRINTF #define snprintf rsync_snprintf int snprintf(char *str,size_t count,const char *fmt,...); #endif @@ -613,12 +637,12 @@ extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] #endif -#ifndef HAVE_STRCHR +#if !HAVE_STRCHR # define strchr index # define strrchr rindex #endif -#ifndef HAVE_ERRNO_DECL +#if !HAVE_ERRNO_DECL extern int errno; #endif @@ -730,7 +754,7 @@ extern int errno; #define INITACCESSPERMS 0700 /* handler for null strings in printf format */ -#define NS(s) ((s)?(s):"") +#define NS(s) ((s)?safe_fname(s):"") #if !defined(__GNUC__) || defined(APPLE) /* Apparently the OS X port of gcc gags on __attribute__. @@ -756,7 +780,7 @@ void rsyserr(enum logcode, int, const char *, ...) __attribute__((format (printf, 3, 4))) ; -#ifdef REPLACE_INET_NTOA +#if REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -765,11 +789,11 @@ void rsyserr(enum logcode, int, const char *, ...) #define O_BINARY 0 #endif -#ifndef HAVE_STRLCPY +#if !HAVE_STRLCPY size_t strlcpy(char *d, const char *s, size_t bufsize); #endif -#ifndef HAVE_STRLCAT +#if !HAVE_STRLCAT size_t strlcat(char *d, const char *s, size_t bufsize); #endif @@ -779,13 +803,13 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) -#ifdef HAVE_GETEUID +#if HAVE_GETEUID #define MY_UID() geteuid() #else #define MY_UID() getuid() #endif -#ifdef HAVE_GETEGID +#if HAVE_GETEGID #define MY_GID() getegid() #else #define MY_GID() getgid() @@ -793,11 +817,11 @@ size_t strlcat(char *d, const char *s, size_t bufsize); extern int verbose; -#ifndef HAVE_INET_NTOP +#if !HAVE_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif /* !HAVE_INET_NTOP */ -#ifndef HAVE_INET_PTON +#if !HAVE_INET_PTON int inet_pton(int af, const char *src, void *dst); #endif