X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/88a7426843ea6b8ee80ea9c986ffc554600ef4e9..a8e6e1486960fe2e9ac190ad53e9830f0f3f900a:/rsync.h diff --git a/rsync.h b/rsync.h index d5111b3c..3656c767 100644 --- a/rsync.h +++ b/rsync.h @@ -2,7 +2,7 @@ * Copyright (C) 1996, 2000 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2001, 2002 Martin Pool - * Copyright (C) 2003-2007 Wayne Davison + * Copyright (C) 2003-2008 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 @@ -32,6 +32,9 @@ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" +#define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */ +#define SYMLINK_PREFIX_LEN ((int)sizeof SYMLINK_PREFIX - 1) + #define BACKUP_SUFFIX "~" /* a non-zero CHAR_OFFSET makes the rolling sum stronger, but is @@ -57,6 +60,7 @@ #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 (HLINKED files only) */ +#define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */ /* These flags are used in the live flist data. */ @@ -64,7 +68,8 @@ #define FLAG_FILE_SENT (1<<1) /* sender/receiver/generator */ #define FLAG_DIR_CREATED (1<<1) /* generator */ #define FLAG_CONTENT_DIR (1<<2) /* sender/receiver/generator */ -#define FLAG_MOUNT_DIR (1<<3) /* sender/generator */ +#define FLAG_MOUNT_DIR (1<<3) /* sender/generator (dirs only) */ +#define FLAG_SKIP_HLINK (1<<3) /* receiver/generator (w/FLAG_HLINKED) */ #define FLAG_DUPLICATE (1<<4) /* sender */ #define FLAG_MISSING_DIR (1<<4) /* generator */ #define FLAG_HLINKED (1<<5) /* receiver/generator (checked on all types) */ @@ -74,6 +79,7 @@ #define FLAG_HLINK_DONE (1<<8) /* receiver/generator (checked on all types) */ #define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */ #define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */ +#define FLAG_TIME_FAILED (1<<11)/* generator */ /* These flags are passed to functions but not stored. */ @@ -85,12 +91,12 @@ == ((unsigned)(b2) & (unsigned)(mask))) /* update this if you make incompatible changes */ -#define PROTOCOL_VERSION 30 +#define PROTOCOL_VERSION 31 /* This is used when working on a new protocol version in CVS, and should * be a new non-zero value for each CVS change that affects the protocol. - * It must ALWAYS be 0 when the protocol goes final! */ -#define SUBPROTOCOL_VERSION 12 + * It must ALWAYS be 0 when the protocol goes final (and NEVER before)! */ +#define SUBPROTOCOL_VERSION 6 /* 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 @@ -122,7 +128,10 @@ #define CHUNK_SIZE (32*1024) #define MAX_MAP_SIZE (256*1024) #define IO_BUFFER_SIZE (4092) -#define MAX_BLOCK_SIZE ((int32)1 << 29) +#define MAX_BLOCK_SIZE ((int32)1 << 17) + +/* For compatibility with older rsyncs */ +#define OLD_MAX_BLOCK_SIZE ((int32)1 << 29) #define IOERR_GENERAL (1<<0) /* For backward compatibility, this must == 1 */ #define IOERR_VANISHED (1<<1) @@ -140,8 +149,9 @@ #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 XFLG_ANCHORED2ABS (1<<2) /* leading slash indicates absolute */ +#define XFLG_ABS_IF_SLASH (1<<3) /* leading or interior slash is absolute */ +#define XFLG_DIR2WILD3 (1<<4) /* dir/ match gets trailing *** added */ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -162,8 +172,9 @@ /* 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_CHANGE (1<<1) +#define ITEM_REPORT_SIZE (1<<2) /* regular files only */ +#define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */ #define ITEM_REPORT_TIME (1<<3) #define ITEM_REPORT_PERMS (1<<4) #define ITEM_REPORT_OWNER (1<<5) @@ -183,19 +194,39 @@ #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 }; +#define CFN_KEEP_DOT_DIRS (1<<0) +#define CFN_KEEP_TRAILING_SLASH (1<<1) +#define CFN_DROP_TRAILING_DOT_DIR (1<<2) +#define CFN_COLLAPSE_DOT_DOT_DIRS (1<<3) + +#define SP_DEFAULT 0 +#define SP_KEEP_DOT_DIRS (1<<0) + +#define CD_NORMAL 0 +#define CD_SKIP_CHDIR 1 + +/* Log-message categories. FLOG only goes to the log file, not the client; + * FCLIENT is the opposite. */ +enum logcode { + FNONE=0, /* never sent */ + FERROR_XFER=1, FINFO=2, /* sent over socket for any protocol */ + FERROR=3, FWARNING=4, /* sent over socket for protocols >= 30 */ + FERROR_SOCKET=5, FLOG=6, /* only sent via receiver -> generator pipe */ + FERROR_UTF8=8, /* only sent via receiver -> generator pipe */ + FCLIENT=7 /* never transmitted (e.g. server converts to FINFO) */ +}; /* 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_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */ + MSG_ERROR_XFER=FERROR_XFER, MSG_INFO=FINFO, /* remote logging */ + MSG_ERROR=FERROR, MSG_WARNING=FWARNING, /* protocol-30 remote logging */ + MSG_ERROR_SOCKET=FERROR_SOCKET, /* sibling logging */ + MSG_ERROR_UTF8=FERROR_UTF8, /* sibling logging */ + MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, /* sibling logging */ MSG_REDO=9, /* reprocess indicated flist index */ + MSG_DEL_STATS=10,/* delete-statistics data follows */ 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 */ @@ -208,8 +239,30 @@ enum msgcode { #define NDX_DONE -1 #define NDX_FLIST_EOF -2 +#define NDX_DEL_STATS -2 #define NDX_FLIST_OFFSET -101 +/* For calling delete_item() and delete_dir_contents(). */ +#define DEL_NO_UID_WRITE (1<<0) /* file/dir has our uid w/o write perm */ +#define DEL_RECURSE (1<<1) /* if dir, delete all contents */ +#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */ +#define DEL_FOR_FILE (1<<3) /* making room for a replacement file */ +#define DEL_FOR_DIR (1<<4) /* making room for a replacement dir */ +#define DEL_FOR_SYMLINK (1<<5) /* making room for a replacement symlink */ +#define DEL_FOR_DEVICE (1<<6) /* making room for a replacement device */ +#define DEL_FOR_SPECIAL (1<<7) /* making room for a replacement special */ +#define DEL_FOR_BACKUP (1<<8) /* the delete is for a backup operation */ + +#define DEL_MAKE_ROOM (DEL_FOR_FILE|DEL_FOR_DIR|DEL_FOR_SYMLINK|DEL_FOR_DEVICE|DEL_FOR_SPECIAL) + +enum delret { + DR_SUCCESS = 0, DR_FAILURE, DR_AT_LIMIT, DR_NOT_EMPTY +}; + +/* Defines for make_path() */ +#define MKP_DROP_NAME (1<<0) /* drop trailing filename or trailing slash */ +#define MKP_SKIP_SLASH (1<<1) /* skip one or more leading slashes */ + #include "errcode.h" #include "config.h" @@ -316,10 +369,6 @@ enum msgcode { #endif #endif -#ifdef HAVE_GLOB_H -#include -#endif - /* these are needed for the uid/gid mapping code */ #include #include @@ -327,7 +376,9 @@ enum msgcode { #include #include #include +#ifdef HAVE_NETDB_H #include +#endif #include #include @@ -369,7 +420,7 @@ enum msgcode { # include #endif -#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#if defined USE_ICONV_OPEN && defined HAVE_ICONV_H #include #ifndef ICONV_CONST #define ICONV_CONST @@ -392,13 +443,13 @@ enum msgcode { #include "lib/pool_alloc.h" #ifndef HAVE_ID_T -typedef int id_t; +typedef unsigned int id_t; #endif #ifndef HAVE_PID_T typedef int pid_t; #endif #ifndef HAVE_MODE_T -typedef int mode_t; +typedef unsigned int mode_t; #endif #ifndef HAVE_OFF_T typedef long off_t; @@ -475,10 +526,12 @@ typedef unsigned int size_t; #if SIZEOF_OFF_T == 8 || !SIZEOF_OFF64_T || !defined HAVE_STRUCT_STAT64 #define OFF_T off_t #define STRUCT_STAT struct stat +#define SIZEOF_CAPITAL_OFF_T SIZEOF_OFF_T #else #define OFF_T off64_t #define STRUCT_STAT struct stat64 #define USE_STAT64_FUNCS 1 +#define SIZEOF_CAPITAL_OFF_T SIZEOF_OFF64_T #endif /* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF @@ -524,6 +577,7 @@ struct hashtable { void *nodes; int32 size, entries; uint32 node_size; + short key64; }; struct ht_int32_node { @@ -641,7 +695,7 @@ extern int xattrs_ndx; #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num -#define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num +#define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num /* These items are per-entry optional: */ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num /* non-dirs */ @@ -656,7 +710,7 @@ extern int xattrs_ndx; /* 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) +#define F_RDEV_P(f) (&OPT_EXTRA(f, HLINK_BUMP(f) + DEV_EXTRA_CNT - 1)->unum) /* The sum is only present on regular files. */ #define F_SUM(f) ((char*)OPT_EXTRA(f, LEN64_BUMP(f) + HLINK_BUMP(f) \ @@ -707,7 +761,7 @@ struct file_list { int used, malloced; int low, high; /* 0-relative index values excluding empties */ int ndx_start; /* the start offset for inc_recurse mode */ - int ndx_end; /* the end offset for inc_recurse mode */ + int flist_num; /* 1-relative file_list number or 0 */ int parent_ndx; /* dir_flist index of parent directory */ int in_progress, to_redo; }; @@ -783,6 +837,7 @@ struct filter_struct { struct filter_list_struct { struct filter_struct *head; struct filter_struct *tail; + struct filter_struct *parent_dirscan_head; char *debug_type; }; @@ -796,13 +851,23 @@ struct stats { int64 flist_buildtime; int64 flist_xfertime; int64 flist_size; - int num_files; - int num_transferred_files; - int current_file_index; + int num_files, num_dirs, num_symlinks, num_devices, num_specials; + int created_files, created_dirs, created_symlinks, created_devices, created_specials; + int deleted_files, deleted_dirs, deleted_symlinks, deleted_devices, deleted_specials; + int xferred_files; }; struct chmod_mode_struct; +struct flist_ndx_item { + struct flist_ndx_item *next; + int ndx; +}; + +typedef struct { + struct flist_ndx_item *head, *tail; +} flist_ndx_list; + #define EMPTY_ITEM_LIST {NULL, 0, 0} typedef struct { @@ -824,7 +889,7 @@ typedef struct { } xbuf; #define INIT_XBUF(xb, str, ln, sz) (xb).buf = (str), (xb).len = (ln), (xb).size = (sz), (xb).pos = 0 -#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (-1), (xb).pos = 0 +#define INIT_XBUF_STRLEN(xb, str) (xb).buf = (str), (xb).len = strlen((xb).buf), (xb).size = (size_t)-1, (xb).pos = 0 /* This one is used to make an output xbuf based on a char[] buffer: */ #define INIT_CONST_XBUF(xb, bf) (xb).buf = (bf), (xb).size = sizeof (bf), (xb).len = (xb).pos = 0 @@ -837,7 +902,7 @@ typedef struct { #define RL_CONVERT (1<<2) typedef struct { - char is_dot_dir; + char name_type; char fname[1]; /* has variable size */ } relnamecache; @@ -1088,7 +1153,57 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define MY_GID() getgid() #endif -extern int verbose; +#ifdef FORCE_FD_ZERO_MEMSET +#undef FD_ZERO +#define FD_ZERO(fdsetp) memset(fdsetp, 0, sizeof (fd_set)) +#endif + +extern short info_levels[], debug_levels[]; + +#define INFO_GTE(flag, lvl) (info_levels[INFO_##flag] >= (lvl)) +#define INFO_EQ(flag, lvl) (info_levels[INFO_##flag] == (lvl)) +#define DEBUG_GTE(flag, lvl) (debug_levels[DEBUG_##flag] >= (lvl)) +#define DEBUG_EQ(flag, lvl) (debug_levels[DEBUG_##flag] == (lvl)) + +#define INFO_BACKUP 0 +#define INFO_COPY (INFO_BACKUP+1) +#define INFO_DEL (INFO_COPY+1) +#define INFO_FLIST (INFO_DEL+1) +#define INFO_MISC (INFO_FLIST+1) +#define INFO_MOUNT (INFO_MISC+1) +#define INFO_NAME (INFO_MOUNT+1) +#define INFO_PROGRESS (INFO_NAME+1) +#define INFO_REMOVE (INFO_PROGRESS+1) +#define INFO_SKIP (INFO_REMOVE+1) +#define INFO_STATS (INFO_SKIP+1) +#define INFO_SYMSAFE (INFO_STATS+1) + +#define COUNT_INFO (INFO_SYMSAFE+1) + +#define DEBUG_ACL 0 +#define DEBUG_BACKUP (DEBUG_ACL+1) +#define DEBUG_BIND (DEBUG_BACKUP+1) +#define DEBUG_CHDIR (DEBUG_BIND+1) +#define DEBUG_CONNECT (DEBUG_CHDIR+1) +#define DEBUG_CMD (DEBUG_CONNECT+1) +#define DEBUG_DEL (DEBUG_CMD+1) +#define DEBUG_DELTASUM (DEBUG_DEL+1) +#define DEBUG_DUP (DEBUG_DELTASUM+1) +#define DEBUG_EXIT (DEBUG_DUP+1) +#define DEBUG_FILTER (DEBUG_EXIT+1) +#define DEBUG_FLIST (DEBUG_FILTER+1) +#define DEBUG_FUZZY (DEBUG_FLIST+1) +#define DEBUG_GENR (DEBUG_FUZZY+1) +#define DEBUG_HASH (DEBUG_GENR+1) +#define DEBUG_HLINK (DEBUG_HASH+1) +#define DEBUG_ICONV (DEBUG_HLINK+1) +#define DEBUG_OWN (DEBUG_ICONV+1) +#define DEBUG_PROTO (DEBUG_OWN+1) +#define DEBUG_RECV (DEBUG_PROTO+1) +#define DEBUG_SEND (DEBUG_RECV+1) +#define DEBUG_TIME (DEBUG_SEND+1) + +#define COUNT_DEBUG (DEBUG_TIME+1) #ifndef HAVE_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size);