X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/46fa602530e36545facf0fdaa527896033686375..25ff04417e4b4fa0aeb44e0b1576a01021aa1650:/rsync.h diff --git a/rsync.h b/rsync.h index b6fea0f0..05224e3f 100644 --- a/rsync.h +++ b/rsync.h @@ -1,18 +1,18 @@ -/* +/* 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. @@ -103,9 +103,9 @@ #define MPLEX_BASE 7 -#define NO_EXCLUDES 0 -#define SERVER_EXCLUDES 1 -#define ALL_EXCLUDES 2 +#define NO_FILTERS 0 +#define SERVER_FILTERS 1 +#define ALL_FILTERS 2 #define XFLG_FATAL_ERRORS (1<<0) #define XFLG_DEF_INCLUDE (1<<1) @@ -133,8 +133,9 @@ /* For calling delete_file() */ #define DEL_DIR (1<<0) -#define DEL_RECURSE (1<<1) /* recurse even w/o --force */ -#define DEL_TERSE (1<<2) +#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 @@ -293,7 +294,7 @@ enum msgcode { #define uchar unsigned char #endif -#if HAVE_UNSIGNED_CHAR +#if SIGNED_CHAR_OK #define schar signed char #else #define schar char @@ -317,7 +318,7 @@ enum msgcode { #define uint32 unsigned int32 #endif -#if HAVE_OFF64_T +#if SIZEOF_OFF64_T #define OFF_T off64_t #define STRUCT_STAT struct stat64 #else @@ -325,18 +326,40 @@ enum msgcode { #define STRUCT_STAT struct stat #endif -#if HAVE_OFF64_T -#define int64 off64_t -#elif (SIZEOF_LONG == 8) -#define int64 long -#elif (SIZEOF_INT == 8) -#define int64 int -#elif HAVE_LONGLONG -#define int64 long long +/* CAVEAT: on some systems, int64 will really be a 32-bit integer IFF + * that's the maximum size the file system can handle and there is no + * 64-bit type available. The rsync source must therefore take steps + * 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 +# define int64 long +# define SIZEOF_INT64 8 +#elif SIZEOF_INT == 8 +# define int64 int +# define SIZEOF_INT64 8 +#elif SIZEOF_LONG_LONG == 8 +# define int64 long long +# define SIZEOF_INT64 8 +#elif SIZEOF_OFF_T == 8 +# define int64 off_t +# define SIZEOF_INT64 8 +#elif SIZEOF_INT > 8 +# define int64 int +# define SIZEOF_INT64 SIZEOF_INT +#elif SIZEOF_LONG > 8 +# define int64 long +# define SIZEOF_INT64 SIZEOF_LONG +#elif SIZEOF_LONG_LONG > 8 +# define int64 long long +# define SIZEOF_INT64 SIZEOF_LONG_LONG #else /* As long as it gets... */ -#define int64 off_t -#define INT64_IS_OFF_T +# define int64 off_t +# define SIZEOF_INT64 SIZEOF_OFF_T #endif /* Starting from protocol version 26, we always use 64-bit @@ -363,7 +386,7 @@ enum msgcode { * * FIXME: I don't think the code in flist.c has ever worked on a system * where dev_t is a struct. - */ + */ struct idev { int64 inode; @@ -516,19 +539,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 */ -struct exclude_struct { - struct exclude_struct *next; +struct filter_struct { + struct filter_struct *next; char *pattern; unsigned int match_flags; union { int slash_cnt; - struct exclude_list_struct *mergelist; + struct filter_list_struct *mergelist; } u; }; -struct exclude_list_struct { - struct exclude_struct *head; - struct exclude_struct *tail; +struct filter_list_struct { + struct filter_struct *head; + struct filter_struct *tail; char *debug_type; }; @@ -539,6 +562,8 @@ struct stats { int64 total_read; int64 literal_data; int64 matched_data; + int64 flist_buildtime; + int64 flist_xfertime; int flist_size; int num_files; int num_transferred_files; @@ -685,7 +710,7 @@ extern int errno; # define NONBLOCK_FLAG O_NONBLOCK #elif defined(SYSV) # define NONBLOCK_FLAG O_NDELAY -#else +#else # define NONBLOCK_FLAG FNDELAY #endif @@ -711,7 +736,7 @@ extern int errno; /* Apparently the OS X port of gcc gags on __attribute__. * * */ -#define __attribute__(x) +#define __attribute__(x) #endif @@ -769,8 +794,7 @@ size_t strlcat(char *d, const char *s, size_t bufsize); extern int verbose; #ifndef HAVE_INET_NTOP -const char * -inet_ntop(int af, const void *src, char *dst, size_t size); +const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif /* !HAVE_INET_NTOP */ #ifndef HAVE_INET_PTON