X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/8fc4033ef08e747c961c1bf6c43995a39bf732f4..9889a34bf2f8d458c15ba4f9ba23aeef00e637d6:/rsync.h diff --git a/rsync.h b/rsync.h index c3ab5888..8e355a3a 100644 --- a/rsync.h +++ b/rsync.h @@ -5,8 +5,9 @@ * 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. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 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 @@ -14,8 +15,7 @@ * 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. + * with this program; if not, visit the http://fsf.org website. */ #define False 0 @@ -49,13 +49,14 @@ #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) /* protocols 28 - NOW */ +#define XMIT_SAME_RDEV_MAJOR (1<<8) /* protocols 28 - NOW (devices only) */ +#define XMIT_NON_XFER_DIR (1<<8) /* protocols 30 - NOW (dirs only) */ #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 */ +#define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - NOW (HLINKED files only) */ /* These flags are used in the live flist data. */ @@ -64,12 +65,14 @@ #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_DUPLICATE (1<<4) /* sender */ #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 */ +#define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */ /* These flags are passed to functions but not stored. */ @@ -86,7 +89,7 @@ /* 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 2 +#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 @@ -362,6 +365,15 @@ enum msgcode { # include #endif +#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H +#include +#ifndef ICONV_CONST +#define ICONV_CONST +#endif +#elif defined ICONV_CONST +#undef ICONV_CONST +#endif + #include #include "lib/pool_alloc.h" @@ -554,8 +566,6 @@ struct idev_node { #define ACLS_NEED_MASK 1 #endif -#define GID_NONE ((gid_t)-1) - union file_extras { int32 num; uint32 unum; @@ -571,14 +581,16 @@ struct file_struct { }; extern int file_extra_cnt; -extern int preserve_uid; -extern int preserve_gid; -extern int preserve_acls; -extern int preserve_xattrs; +extern int uid_ndx; +extern int gid_ndx; +extern int acls_ndx; +extern int xattrs_ndx; #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 DEV_EXTRA_CNT 2 +#define DIRNODE_EXTRA_CNT 3 #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN) #define REQ_EXTRA(f,ndx) ((union file_extras*)(f) - (ndx)) @@ -586,6 +598,7 @@ extern int preserve_xattrs; #define LEN64_BUMP(f) ((f)->flags & FLAG_LENGTH64 ? 1 : 0) #define HLINK_BUMP(f) (F_IS_HLINKED(f) ? 1 : 0) +#define ACL_BUMP(f) (acls_ndx ? 1 : 0) /* The length applies to all items. */ #if SIZEOF_INT64 < 8 @@ -605,25 +618,28 @@ extern int preserve_xattrs; #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) +#define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum +#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 + +/* These items are per-entry optional: */ +#define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num /* non-dirs */ +#define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f))->num /* non-dirs */ +#define F_DIR_NODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) \ + + DIRNODE_EXTRA_CNT - 1)->num) /* sender dirs */ +#define F_DIR_DEFACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum /* receiver dirs */ +#define F_DIR_DEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + ACL_BUMP(f) \ + + DEV_EXTRA_CNT - 1)->unum) /* receiver dirs */ /* 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)) +#define F_SUM(f) ((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] @@ -632,9 +648,6 @@ extern int preserve_xattrs; #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] @@ -658,18 +671,20 @@ extern int preserve_xattrs; * (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 NORMAL_EXTENT (256 * 1024) +#define SMALL_EXTENT (128 * 1024) #define FLIST_TEMP (1<<1) struct file_list { struct file_list *next, *prev; - struct file_struct **files; + struct file_struct **files, **sorted; alloc_pool_t file_pool; - int count, malloced; - int low, high; /* 0-relative index values excluding empties */ - int ndx_start; /* the start offset for inc_recurse mode */ + void *pool_boundary; + 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 parent_ndx; /* dir_flist index of parent directory */ int in_progress, to_redo; };