X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/96a8ca6d985e840d34a9152775680626b44f4c07..16edf86595a5a990a942fa045dfb523dae1fe6cb:/rsync.h diff --git a/rsync.h b/rsync.h index 17f39f13..6b25e6c2 100644 --- a/rsync.h +++ b/rsync.h @@ -1,23 +1,22 @@ /* - Copyright (C) by Andrew Tridgell 1996, 2000 - Copyright (C) Paul Mackerras 1996 - Copyright (C) 2001, 2002 by Martin Pool - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - + * Copyright (C) 1996, 2000 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2001, 2002 Martin Pool + * Copyright (C) 2003-2007 Wayne Davison + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #define False 0 #define True 1 @@ -43,28 +42,46 @@ #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 */ +#define XMIT_SAME_RDEV_pre28 (1<<2) /* protocols 20 - 27 */ +#define XMIT_EXTENDED_FLAGS (1<<2) /* protocols 28 - NOW */ #define XMIT_SAME_UID (1<<3) #define XMIT_SAME_GID (1<<4) #define XMIT_SAME_NAME (1<<5) #define XMIT_LONG_NAME (1<<6) #define XMIT_SAME_TIME (1<<7) -#define XMIT_SAME_RDEV_MAJOR (1<<8) -#define XMIT_HAS_IDEV_DATA (1<<9) -#define XMIT_SAME_DEV (1<<10) -#define XMIT_RDEV_MINOR_IS_SMALL (1<<11) +#define XMIT_SAME_RDEV_MAJOR (1<<8) /* protocols 28 - NOW */ +#define XMIT_HLINKED (1<<9) /* protocols 28 - NOW */ +#define XMIT_SAME_DEV_pre30 (1<<10) /* protocols 28 - 29 */ +#define XMIT_USER_NAME_FOLLOWS (1<<10) /* protocols 30 - NOW */ +#define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */ +#define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - NOW */ +#define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - NOW */ /* These flags are used in the live flist data. */ -#define FLAG_TOP_DIR (1<<0) -#define FLAG_HLINK_EOL (1<<1) /* generator only */ -#define FLAG_MOUNT_POINT (1<<2) /* sender only */ -#define FLAG_NO_FUZZY (1<<2) /* generator only */ -#define FLAG_DEL_HERE (1<<3) /* receiver/generator */ +#define FLAG_TOP_DIR (1<<0) /* sender/receiver/generator */ +#define FLAG_FILE_SENT (1<<1) /* sender/receiver/generator */ +#define FLAG_DIR_CHANGED (1<<1) /* generator */ +#define FLAG_XFER_DIR (1<<2) /* sender/receiver/generator */ +#define FLAG_MOUNT_DIR (1<<3) /* sender/generator */ +#define FLAG_MISSING_DIR (1<<4) /* generator */ +#define FLAG_HLINKED (1<<5) /* receiver/generator */ +#define FLAG_HLINK_FIRST (1<<6) /* receiver/generator */ +#define FLAG_HLINK_LAST (1<<7) /* receiver/generator */ +#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */ +#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */ + +/* These flags are passed to functions but not stored. */ + +#define FLAG_DIVERT_DIRS (1<<16)/* sender */ + +#define BITS_SET(val,bits) (((val) & (bits)) == (bits)) +#define BITS_SETnUNSET(val,onbits,offbits) (((val) & ((onbits)|(offbits))) == (onbits)) +#define BITS_EQUAL(b1,b2,mask) (((unsigned)(b1) & (unsigned)(mask)) \ + == ((unsigned)(b2) & (unsigned)(mask))) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 29 +#define PROTOCOL_VERSION 30 /* We refuse to interoperate with versions that are not in this range. * Note that we assume we'll work with later versions: the onus is on @@ -87,6 +104,8 @@ #define OLD_PROTOCOL_VERSION 25 #define MAX_PROTOCOL_VERSION 40 +#define FILECNT_LOOKAHEAD 1000 + #define RSYNC_PORT 873 #define SPARSE_WRITE_SIZE (1024) @@ -98,10 +117,11 @@ #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) +#define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 - #define MAX_BASIS_DIRS 20 +#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100) #define MPLEX_BASE 7 @@ -112,9 +132,10 @@ #define XFLG_FATAL_ERRORS (1<<0) #define XFLG_OLD_PREFIXES (1<<1) #define XFLG_ANCHORED2ABS (1<<2) +#define XFLG_ABS_IF_SLASH (1<<3) -#define PERMS_REPORT (1<<0) -#define PERMS_SKIP_MTIME (1<<1) +#define ATTRS_REPORT (1<<0) +#define ATTRS_SKIP_MTIME (1<<1) #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 @@ -130,26 +151,56 @@ #define FNAMECMP_BACKUP 0x82 #define FNAMECMP_FUZZY 0x83 -/* For calling delete_file() */ -#define DEL_DIR (1<<0) -#define DEL_NO_RECURSE (1<<1) -#define DEL_FORCE_RECURSE (1<<2) /* recurse even w/o --force */ -#define DEL_TERSE (1<<3) - - -/* Log-message categories. FLOG is only used on the daemon side to - * output messages to the log file. */ -enum logcode { FERROR=1, FINFO=2, FLOG=3 }; +/* For use by the itemize_changes code */ +#define ITEM_REPORT_ATIME (1<<0) +#define ITEM_REPORT_CHECKSUM (1<<1) +#define ITEM_REPORT_SIZE (1<<2) +#define ITEM_REPORT_TIME (1<<3) +#define ITEM_REPORT_PERMS (1<<4) +#define ITEM_REPORT_OWNER (1<<5) +#define ITEM_REPORT_GROUP (1<<6) +#define ITEM_REPORT_ACL (1<<7) +#define ITEM_REPORT_XATTR (1<<8) +#define ITEM_BASIS_TYPE_FOLLOWS (1<<11) +#define ITEM_XNAME_FOLLOWS (1<<12) +#define ITEM_IS_NEW (1<<13) +#define ITEM_LOCAL_CHANGE (1<<14) +#define ITEM_TRANSFER (1<<15) +/* These are outside the range of the transmitted flags. */ +#define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */ +#define ITEM_DELETED (1<<17) /* used by log_formatted() */ +#define ITEM_MATCHED (1<<18) /* used by itemize() */ + +#define SIGNIFICANT_ITEM_FLAGS (~(\ + ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) + + +/* Log-message categories. Only FERROR and FINFO get sent over the socket, + * but FLOG and FSOCKERR can be sent over the receiver -> generator pipe. + * FLOG only goes to the log file, not the client; FCLIENT is the opposite. */ +enum logcode { FNONE=0, FERROR=1, FINFO=2, FLOG=3, FCLIENT=4, FSOCKERR=5 }; /* Messages types that are sent over the message channel. The logcode * values must all be present here with identical numbers. */ enum msgcode { - MSG_DONE=5, /* current phase is done */ - MSG_REDO=4, /* reprocess indicated flist index */ - MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ - MSG_DATA=0 /* raw data on the multiplexed stream */ + MSG_DATA=0, /* raw data on the multiplexed stream */ + MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ + MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */ + MSG_REDO=9, /* reprocess indicated flist index */ + MSG_FLIST=20, /* extra file list over sibling socket */ + MSG_FLIST_EOF=21,/* we've transmitted all the file lists */ + MSG_IO_ERROR=22,/* the sending side had an I/O error */ + MSG_NOOP=42, /* a do-nothing message */ + MSG_SUCCESS=100,/* successfully updated indicated flist index */ + MSG_DELETED=101,/* successfully deleted a file on receiving side */ + MSG_NO_SEND=102,/* sender failed to open a file we wanted */ + MSG_DONE=86 /* current phase is done */ }; +#define NDX_DONE -1 +#define NDX_FLIST_EOF -2 +#define NDX_FLIST_OFFSET -101 + #include "errcode.h" #include "config.h" @@ -180,6 +231,9 @@ enum msgcode { #ifdef HAVE_STRINGS_H # include #endif +#ifdef HAVE_INTTYPES_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif @@ -282,17 +336,27 @@ enum msgcode { #ifdef MAJOR_IN_MKDEV #include -# if !defined makedev && defined mkdev +# if !defined makedev && (defined mkdev || defined _WIN32 || defined __WIN32__) # define makedev mkdev # endif #elif defined MAJOR_IN_SYSMACROS #include #endif +#ifdef MAKEDEV_TAKES_3_ARGS +#define MAKEDEV(devmajor,devminor) makedev(0,devmajor,devminor) +#else +#define MAKEDEV(devmajor,devminor) makedev(devmajor,devminor) +#endif + #ifdef HAVE_COMPAT_H #include #endif +#ifdef HAVE_LIMITS_H +# include +#endif + #include #include "lib/pool_alloc.h" @@ -309,11 +373,30 @@ enum msgcode { #define schar char #endif +#ifndef int16 +#if SIZEOF_INT16_T == 2 +# define int16 int16_t +#else +# define int16 short +#endif +#endif + +#ifndef uint16 +#if SIZEOF_UINT16_T == 2 +# define uint16 uint16_t +#else +# define uint16 unsigned int16 +#endif +#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 +#if SIZEOF_INT32_T == 4 +# define int32 int32_t +# define SIZEOF_INT32 4 +#elif SIZEOF_INT == 4 # define int32 int # define SIZEOF_INT32 4 #elif SIZEOF_LONG == 4 @@ -336,7 +419,11 @@ enum msgcode { #endif #ifndef uint32 -#define uint32 unsigned int32 +#if SIZEOF_UINT32_T == 4 +# define uint32 uint32_t +#else +# define uint32 unsigned int32 +#endif #endif #if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !defined HAVE_STRUCT_STAT64 @@ -354,8 +441,8 @@ enum msgcode { * to ensure that any code that really requires a 64-bit integer has * it (e.g. the checksum code uses two 32-bit integers for its 64-bit * counter). */ -#if SIZEOF_OFF64_T == 8 -# define int64 off64_t +#if SIZEOF_INT64_T == 8 +# define int64 int64_t # define SIZEOF_INT64 8 #elif SIZEOF_LONG == 8 # define int64 long @@ -366,6 +453,9 @@ enum msgcode { #elif SIZEOF_LONG_LONG == 8 # define int64 long long # define SIZEOF_INT64 8 +#elif SIZEOF_OFF64_T == 8 +# define int64 off64_t +# define SIZEOF_INT64 8 #elif SIZEOF_OFF_T == 8 # define int64 off_t # define SIZEOF_INT64 8 @@ -410,9 +500,9 @@ enum msgcode { * where dev_t is a struct. */ -struct idev { - int64 inode; - int64 dev; +struct idev_node { + int64 key; + void *data; }; #ifndef MIN @@ -427,8 +517,6 @@ struct idev { #define MAXHOSTNAMELEN 256 #endif -/* the length of the md4 checksum */ -#define MD4_SUM_LENGTH 16 #define SUM_LENGTH 16 #define SHORT_SUM_LENGTH 2 #define BLOCKSUM_BIAS 10 @@ -437,6 +525,14 @@ struct idev { #define MAXPATHLEN 1024 #endif +/* We want a roomy line buffer that can hold more than MAXPATHLEN, + * and significantly more than an overly short MAXPATHLEN. */ +#if MAXPATHLEN < 4096 +#define BIGPATHBUFLEN (4096+1024) +#else +#define BIGPATHBUFLEN (MAXPATHLEN+1024) +#endif + #ifndef NAME_MAX #define NAME_MAX 255 #endif @@ -449,45 +545,97 @@ struct idev { #define IN_LOOPBACKNET 127 #endif +#if HAVE_UNIXWARE_ACLS|HAVE_SOLARIS_ACLS|HAVE_HPUX_ACLS +#define ACLS_NEED_MASK 1 +#endif + #define GID_NONE ((gid_t)-1) -#define HL_CHECK_MASTER 0 -#define HL_SKIP 1 +union file_extras { + int32 num; + uint32 unum; +}; -struct hlink { - struct file_struct *next; - int hlindex; +struct file_struct { + const char *dirname; /* The dir info inside the transfer */ + time_t modtime; /* When the item was last modified */ + uint32 len32; /* Lowest 32 bits of the file's length */ + uint16 mode; /* The item's type and permissions */ + uint16 flags; /* The FLAG_* bits for this item */ + const char basename[1]; /* The basename (AKA filename) follows */ }; -#define F_DEV link_u.idev->dev -#define F_INODE link_u.idev->inode +extern int file_extra_cnt; +extern int preserve_uid; +extern int preserve_gid; +extern int preserve_acls; +extern int preserve_xattrs; -#define F_HLINDEX link_u.links->hlindex -#define F_NEXT link_u.links->next +#define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) +#define EXTRA_LEN (sizeof (union file_extras)) +#define PTR_EXTRA_LEN ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN) +#define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN) -struct file_struct { - union { - dev_t rdev; /* The device number, if this is a device */ - char *sum; /* Only a normal file can have a checksum */ - char *link; /* Points to symlink string, if a symlink */ - } u; - OFF_T length; - 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; - } link_u; - time_t modtime; - uid_t uid; - gid_t gid; - mode_t mode; - uchar flags; /* this item MUST remain last */ -}; +#define REQ_EXTRA(f,ndx) ((union file_extras*)(f) - (ndx)) +#define OPT_EXTRA(f,bump) ((union file_extras*)(f) - file_extra_cnt - 1 - (bump)) + +#define LEN64_BUMP(f) ((f)->flags & FLAG_LENGTH64 ? 1 : 0) +#define HLINK_BUMP(f) (F_IS_HLINKED(f) ? 1 : 0) + +/* The length applies to all items. */ +#if SIZEOF_INT64 < 8 +#define F_LENGTH(f) ((int64)(f)->len32) +#else +#define F_LENGTH(f) ((int64)(f)->len32 + ((f)->flags & FLAG_LENGTH64 \ + ? (int64)OPT_EXTRA(f, 0)->unum << 32 : 0)) +#endif + +/* If there is a symlink string, it is always right after the basename */ +#define F_SYMLINK(f) ((f)->basename + strlen((f)->basename) + 1) + +/* The sending side always has this available: */ +#define F_ROOTDIR(f) (*(const char**)REQ_EXTRA(f, PTR_EXTRA_LEN)) + +/* The receiving side always has this available: */ +#define F_DEPTH(f) REQ_EXTRA(f, 1)->num + +/* When the associated option is on, all entries will have these present: */ +#define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum +#define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum +#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num +#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num + +/* These items are per-entry optional and mutally exclusive: */ +#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num +#define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num +#define F_DEF_ACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum +#define F_DIRDEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 2 - 1)->unum) +#define F_DIRNODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + 3 - 1)->num) + +/* This optional item might follow an F_HL_*() item. + * (Note: a device doesn't need to check LEN64_BUMP(f).) */ +#define F_RDEV_P(f) (&OPT_EXTRA(f, HLINK_BUMP(f) + 2 - 1)->unum) + +/* The sum is only present on regular files. */ +#define F_SUM(f) ((const char*)OPT_EXTRA(f, LEN64_BUMP(f) + HLINK_BUMP(f) \ + + SUM_EXTRA_CNT - 1)) + +/* Some utility defines: */ +#define F_IS_ACTIVE(f) (f)->basename[0] +#define F_IS_HLINKED(f) ((f)->flags & FLAG_HLINKED) + +#define F_HLINK_NOT_FIRST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_FIRST) +#define F_HLINK_NOT_LAST(f) BITS_SETnUNSET((f)->flags, FLAG_HLINKED, FLAG_HLINK_LAST) + +#define F_UID(f) ((uid_t)F_OWNER(f)) +#define F_GID(f) ((gid_t)F_GROUP(f)) + +#define DEV_MAJOR(a) (a)[0] +#define DEV_MINOR(a) (a)[1] + +#define DIR_PARENT(a) (a)[0] +#define DIR_FIRST_CHILD(a) (a)[1] +#define DIR_NEXT_SIBLING(a) (a)[2] /* * Start the flist array at FLIST_START entries and grow it @@ -497,27 +645,28 @@ struct file_struct { #define FLIST_LINEAR (FLIST_START * 512) /* - * Extent size for allocation pools A minimum size of 128KB + * Extent size for allocation pools: A minimum size of 128KB * is needed to mmap them so that freeing will release the * space to the OS. * * Larger sizes reduce leftover fragments and speed free calls - * (when they happen) Smaller sizes increase the chance of + * (when they happen). Smaller sizes increase the chance of * freed allocations freeing whole extents. */ #define FILE_EXTENT (256 * 1024) #define HLINK_EXTENT (128 * 1024) -#define WITH_HLINK 1 -#define WITHOUT_HLINK 0 +#define FLIST_TEMP (1<<1) struct file_list { + struct file_list *next, *prev; struct file_struct **files; alloc_pool_t file_pool; - alloc_pool_t hlink_pool; - int count; - int malloced; - int low, high; + int count, malloced; + int low, high; /* 0-relative index values excluding empties */ + int ndx_start; /* the start offset for inc_recurse mode */ + int parent_ndx; /* dir_flist index of parent directory */ + int in_progress, to_redo; }; #define SUMFLG_SAME_OFFSET (1<<0) @@ -526,6 +675,7 @@ struct sum_buf { OFF_T offset; /**< offset in file of this chunk */ int32 len; /**< length of chunk of file */ uint32 sum1; /**< simple checksum */ + int32 chain; /**< next hash-table collision */ short flags; /**< flag bits */ char sum2[SUM_LENGTH]; /**< checksum */ }; @@ -553,11 +703,11 @@ struct map_struct { #define MATCHFLG_WILD (1<<0) /* pattern has '*', '[', and/or '?' */ #define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */ -#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */ -#define MATCHFLG_ABS_PATH (1<<3) /* path-match on absolute path */ -#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */ -#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */ -#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */ +#define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with "**" */ +#define MATCHFLG_WILD3_SUFFIX (1<<3) /* pattern ends with "***" */ +#define MATCHFLG_ABS_PATH (1<<4) /* path-match on absolute path */ +#define MATCHFLG_INCLUDE (1<<5) /* this is an include, not an exclude */ +#define MATCHFLG_DIRECTORY (1<<6) /* this matches only directories */ #define MATCHFLG_WORD_SPLIT (1<<7) /* split rules on whitespace */ #define MATCHFLG_NO_INHERIT (1<<8) /* don't inherit these rules */ #define MATCHFLG_NO_PREFIXES (1<<9) /* parse no prefixes from patterns */ @@ -569,10 +719,13 @@ struct map_struct { #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 MATCHFLG_CLEAR_LIST (1<<18)/* this item is the "!" token */ +#define MATCHFLG_PERISHABLE (1<<19)/* perishable if parent dir goes away */ #define MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \ | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \ - | MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE) + | MATCHFLG_NEGATE | MATCHFLG_RECEIVER_SIDE \ + | MATCHFLG_PERISHABLE) struct filter_struct { struct filter_struct *next; @@ -599,19 +752,57 @@ struct stats { int64 matched_data; int64 flist_buildtime; int64 flist_xfertime; - int flist_size; + int64 flist_size; int num_files; int num_transferred_files; int current_file_index; }; +struct chmod_mode_struct; + +#define EMPTY_ITEM_LIST {NULL, 0, 0} + +typedef struct { + void *items; + size_t count; + size_t malloced; +} item_list; + +#define EXPAND_ITEM_LIST(lp, type, incr) \ + (type*)expand_item_list(lp, sizeof (type), #type, incr) #include "byteorder.h" -#include "lib/mdfour.h" +#include "lib/mdigest.h" #include "lib/wildmatch.h" #include "lib/permstring.h" #include "lib/addrinfo.h" +#ifndef __GNUC__ +#define __attribute__(x) +# if __GNUC__ <= 2 +# define NORETURN +# endif +#endif + +#define UNUSED(x) x __attribute__((__unused__)) +#ifndef NORETURN +#define NORETURN __attribute__((__noreturn__)) +#endif + +typedef struct { + STRUCT_STAT st; +#ifdef SUPPORT_ACLS + struct rsync_acl *acc_acl; /* access ACL */ + struct rsync_acl *def_acl; /* default ACL */ +#endif +#ifdef SUPPORT_XATTRS + item_list *xattr; +#endif +} statx; + +#define ACL_READY(sx) ((sx).acc_acl != NULL) +#define XATTR_READY(sx) ((sx).xattr != NULL) + #include "proto.h" /* We have replacement versions of these if they're missing. */ @@ -630,7 +821,7 @@ int vsnprintf(char *str, size_t count, const char *fmt, va_list args); #if !defined HAVE_SNPRINTF || !defined HAVE_C99_VSNPRINTF #define snprintf rsync_snprintf -int snprintf(char *str,size_t count,const char *fmt,...); +int snprintf(char *str, size_t count, const char *fmt,...); #endif @@ -648,10 +839,19 @@ extern char *sys_errlist[]; extern int errno; #endif -#define SUPPORT_LINKS HAVE_READLINK -#define SUPPORT_HARD_LINKS HAVE_LINK +#ifdef HAVE_READLINK +#define SUPPORT_LINKS 1 +#endif +#ifdef HAVE_LINK +#define SUPPORT_HARD_LINKS 1 +#endif -#define SIGNAL_CAST (RETSIGTYPE (*)()) +#ifdef HAVE_SIGACTION +#define SIGACTION(n,h) sigact.sa_handler=(h), sigaction((n),&sigact,NULL) +#define signal(n,h) we_need_to_call_SIGACTION_not_signal(n,h) +#else +#define SIGACTION(n,h) signal(n,h) +#endif #ifndef EWOULDBLOCK #define EWOULDBLOCK EAGAIN @@ -748,7 +948,8 @@ extern int errno; #define INADDR_NONE 0xffffffff #endif -#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode) || S_ISSOCK(mode) || S_ISFIFO(mode)) +#define IS_SPECIAL(mode) (S_ISSOCK(mode) || S_ISFIFO(mode)) +#define IS_DEVICE(mode) (S_ISCHR(mode) || S_ISBLK(mode)) /* Initial mask on permissions given to temporary files. Mask off setuid bits and group access because of potential race-condition security @@ -756,15 +957,7 @@ extern int errno; #define INITACCESSPERMS 0700 /* handler for null strings in printf format */ -#define NS(s) ((s)?safe_fname(s):"") - -#if !defined __GNUC__ || defined __APPLE__ -/* Apparently the OS X port of gcc gags on __attribute__. - * - * */ -#define __attribute__(x) - -#endif +#define NS(s) ((s)?(s):"") /* Convenient wrappers for malloc and realloc. Use them. */ #define new(type) ((type *)malloc(sizeof(type))) @@ -782,10 +975,6 @@ void rsyserr(enum logcode, int, const char *, ...) __attribute__((format (printf, 3, 4))) ; -#ifdef REPLACE_INET_NTOA -#define inet_ntoa rep_inet_ntoa -#endif - /* Make sure that the O_BINARY flag is defined. */ #ifndef O_BINARY #define O_BINARY 0 @@ -802,6 +991,9 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #ifndef WEXITSTATUS #define WEXITSTATUS(stat) ((int)(((stat)>>8)&0xFF)) #endif +#ifndef WIFEXITED +#define WIFEXITED(stat) ((int)((stat)&0xFF) == 0) +#endif #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) @@ -831,6 +1023,44 @@ int inet_pton(int af, const char *src, void *dst); const char *get_panic_action(void); #endif -#define UNUSED(x) x __attribute__((__unused__)) - -extern const char *io_write_phase, *io_read_phase; +static inline int +isDigit(const char *ptr) +{ + return isdigit(*(unsigned char *)ptr); +} + +static inline int +isPrint(const char *ptr) +{ + return isprint(*(unsigned char *)ptr); +} + +static inline int +isSpace(const char *ptr) +{ + return isspace(*(unsigned char *)ptr); +} + +static inline int +isLower(const char *ptr) +{ + return islower(*(unsigned char *)ptr); +} + +static inline int +isUpper(const char *ptr) +{ + return isupper(*(unsigned char *)ptr); +} + +static inline int +toLower(const char *ptr) +{ + return tolower(*(unsigned char *)ptr); +} + +static inline int +toUpper(const char *ptr) +{ + return toupper(*(unsigned char *)ptr); +}