X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a22ca88565a116e6867d75222222e522bea67c30..e0930845ce339fc51f607ba19bc40a8685118b91:/rsync.h diff --git a/rsync.h b/rsync.h index 5a86d083..a70c241c 100644 --- a/rsync.h +++ b/rsync.h @@ -1,23 +1,23 @@ /* - 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, 2004, 2005, 2006 Wayne Davison + * + * 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., + * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + */ #define False 0 #define True 1 @@ -58,12 +58,13 @@ /* These flags are used in the live flist data. */ #define FLAG_TOP_DIR (1<<0) +#define FLAG_SENT (1<<1) /* sender */ #define FLAG_HLINK_EOL (1<<1) /* receiver/generator */ -#define FLAG_MOUNT_POINT (1<<2) /* sender */ -#define FLAG_NO_FUZZY (1<<2) /* generator */ +#define FLAG_MOUNT_POINT (1<<2) /* sender/generator */ #define FLAG_DEL_HERE (1<<3) /* receiver/generator */ -#define FLAG_SENT (1<<3) /* sender */ #define FLAG_HLINK_TOL (1<<4) /* receiver/generator */ +#define FLAG_NO_FUZZY (1<<5) /* generator */ +#define FLAG_MISSING (1<<6) /* generator */ /* update this if you make incompatible changes */ #define PROTOCOL_VERSION 29 @@ -115,9 +116,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 @@ -133,26 +135,22 @@ #define FNAMECMP_BACKUP 0x82 #define FNAMECMP_FUZZY 0x83 -/* For calling delete_file() */ -#define DEL_NO_RECURSE (1<<1) -#define DEL_FORCE_RECURSE (1<<2) /* recurse even w/o --force */ -#define DEL_TERSE (1<<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_XATTRS (1<<7) +#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_NO_DEST_AND_NO_UPDATE (1<<16) /* used by itemize() */ #define ITEM_MISSING_DATA (1<<16) /* used by log_formatted() */ #define ITEM_DELETED (1<<17) /* used by log_formatted() */ @@ -160,16 +158,17 @@ ITEM_BASIS_TYPE_FOLLOWS | ITEM_XNAME_FOLLOWS | ITEM_LOCAL_CHANGE)) -/* Log-message categories. FLOG and FCLIENT are only used on the daemon - * side for custom logging -- they don't get sent over the socket. */ -enum logcode { FERROR=1, FINFO=2, FLOG=3, FCLIENT=4 }; +/* 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_DATA=0, /* raw data on the multiplexed stream */ MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */ - MSG_LOG=FLOG, MSG_FCLIENT=FCLIENT, /* sibling logging */ + MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */ MSG_REDO=9, /* reprocess indicated flist index */ MSG_SUCCESS=100,/* successfully updated indicated flist index */ MSG_DELETED=101,/* successfully deleted a file on receiving side */ @@ -315,10 +314,20 @@ enum msgcode { #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" @@ -380,10 +389,7 @@ 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 -# define SIZEOF_INT64 8 -#elif SIZEOF_LONG == 8 +#if SIZEOF_LONG == 8 # define int64 long # define SIZEOF_INT64 8 #elif SIZEOF_INT == 8 @@ -392,6 +398,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 @@ -489,8 +498,9 @@ struct idev { #define HL_SKIP 1 struct hlink { - int next; - int hlindex; + int32 next; + int32 hlindex; + unsigned short link_dest_used; }; #define F_DEV link_u.idev->dev @@ -560,6 +570,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 */ }; @@ -587,11 +598,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 */ @@ -603,6 +614,7 @@ 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 MATCHFLGS_FROM_CONTAINER (MATCHFLG_ABS_PATH | MATCHFLG_INCLUDE \ | MATCHFLG_DIRECTORY | MATCHFLG_SENDER_SIDE \ @@ -639,6 +651,7 @@ struct stats { int current_file_index; }; +struct chmod_mode_struct; #include "byteorder.h" #include "lib/mdfour.h" @@ -646,6 +659,13 @@ struct stats { #include "lib/permstring.h" #include "lib/addrinfo.h" +#ifndef __GNUC__ +#define __attribute__(x) +#endif + +#define UNUSED(x) x __attribute__((__unused__)) +#define NORETURN __attribute__((__noreturn__)) + #include "proto.h" /* We have replacement versions of these if they're missing. */ @@ -689,7 +709,12 @@ extern int errno; #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 @@ -786,7 +811,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 @@ -794,15 +820,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))) @@ -820,10 +838,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 @@ -840,6 +854,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__) @@ -868,7 +885,3 @@ int inet_pton(int af, const char *src, void *dst); #ifdef MAINTAINER_MODE const char *get_panic_action(void); #endif - -#define UNUSED(x) x __attribute__((__unused__)) - -extern const char *io_write_phase, *io_read_phase;