X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7842418b7b87c4c78ad8ad06fec44150c8aa0956..e95538ca2c8fdecd66a112635aa30077419af685:/rsync.h diff --git a/rsync.h b/rsync.h index 0c04679e..0327f2de 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. @@ -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 @@ -156,91 +157,108 @@ enum msgcode { /* The default RSYNC_RSH is always set in config.h. */ -#include - -#ifdef HAVE_UNISTD_H -#include -#endif #include -#include - -#ifdef HAVE_SYS_PARAM_H -#include +#if HAVE_SYS_TYPES_H +# include +#endif +#if HAVE_SYS_STAT_H +# include +#endif +#if STDC_HEADERS +# include +# include +#else +# if HAVE_STDLIB_H +# include +# endif +#endif +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H +# include +# endif +# include +#endif +#if HAVE_STRINGS_H +# include +#endif +#if HAVE_INTTYPES_H +# include +#else +# if HAVE_STDINT_H +# include +# endif +#endif +#if HAVE_UNISTD_H +# include #endif -#ifdef HAVE_STDLIB_H -#include +#if HAVE_SYS_PARAM_H +#include #endif -#if defined(HAVE_MALLOC_H) && (defined(HAVE_MALLINFO) || !defined(HAVE_STDLIB_H)) +#if HAVE_MALLOC_H && (HAVE_MALLINFO || !HAVE_STDLIB_H) #include #endif -#ifdef HAVE_SYS_SOCKET_H +#if HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_STRING_H -#include -#endif - -#ifdef TIME_WITH_SYS_TIME +#if TIME_WITH_SYS_TIME #include #include #else -#ifdef HAVE_SYS_TIME_H +#if HAVE_SYS_TIME_H #include #else #include #endif #endif -#ifdef HAVE_FCNTL_H +#if HAVE_FCNTL_H #include #else -#ifdef HAVE_SYS_FCNTL_H +#if HAVE_SYS_FCNTL_H #include #endif #endif -#include - -#ifdef HAVE_SYS_IOCTL_H +#if HAVE_SYS_IOCTL_H #include #endif -#ifdef HAVE_SYS_FILIO_H +#if HAVE_SYS_FILIO_H #include #endif #include -#ifdef HAVE_SYS_WAIT_H +#if HAVE_SYS_WAIT_H #include #endif -#ifdef HAVE_CTYPE_H +#if HAVE_CTYPE_H #include #endif -#ifdef HAVE_GRP_H +#if HAVE_GRP_H #include #endif #include -#ifdef HAVE_UTIME_H +#if HAVE_UTIME_H #include #endif -#ifdef HAVE_SYS_SELECT_H +#if HAVE_SYS_SELECT_H #include #endif -#ifdef HAVE_SYS_MODE_H +#if HAVE_SYS_MODE_H /* apparently AIX needs this for S_ISLNK */ #ifndef S_ISLNK #include #endif #endif -#ifdef HAVE_GLOB_H +#if HAVE_GLOB_H #include #endif @@ -279,7 +297,7 @@ enum msgcode { #include #endif -#ifdef HAVE_COMPAT_H +#if HAVE_COMPAT_H #include #endif @@ -293,7 +311,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 +335,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 +343,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 +403,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; @@ -539,6 +579,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; @@ -564,20 +606,20 @@ static inline int flist_up(struct file_list *flist, int i) #include "proto.h" /* We have replacement versions of these if they're missing. */ -#ifndef HAVE_ASPRINTF +#if !HAVE_ASPRINTF int asprintf(char **ptr, const char *format, ...); #endif -#ifndef HAVE_VASPRINTF +#if !HAVE_VASPRINTF int vasprintf(char **ptr, const char *format, va_list ap); #endif -#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_VSNPRINTF || !HAVE_C99_VSNPRINTF #define vsnprintf rsync_vsnprintf int vsnprintf(char *str, size_t count, const char *fmt, va_list args); #endif -#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#if !HAVE_SNPRINTF || !HAVE_C99_VSNPRINTF #define snprintf rsync_snprintf int snprintf(char *str,size_t count,const char *fmt,...); #endif @@ -588,12 +630,12 @@ extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] #endif -#ifndef HAVE_STRCHR +#if !HAVE_STRCHR # define strchr index # define strrchr rindex #endif -#ifndef HAVE_ERRNO_DECL +#if !HAVE_ERRNO_DECL extern int errno; #endif @@ -685,7 +727,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 +753,7 @@ extern int errno; /* Apparently the OS X port of gcc gags on __attribute__. * * */ -#define __attribute__(x) +#define __attribute__(x) #endif @@ -731,7 +773,7 @@ void rsyserr(enum logcode, int, const char *, ...) __attribute__((format (printf, 3, 4))) ; -#ifdef REPLACE_INET_NTOA +#if REPLACE_INET_NTOA #define inet_ntoa rep_inet_ntoa #endif @@ -740,11 +782,11 @@ void rsyserr(enum logcode, int, const char *, ...) #define O_BINARY 0 #endif -#ifndef HAVE_STRLCPY +#if !HAVE_STRLCPY size_t strlcpy(char *d, const char *s, size_t bufsize); #endif -#ifndef HAVE_STRLCAT +#if !HAVE_STRLCAT size_t strlcat(char *d, const char *s, size_t bufsize); #endif @@ -754,13 +796,13 @@ size_t strlcat(char *d, const char *s, size_t bufsize); #define exit_cleanup(code) _exit_cleanup(code, __FILE__, __LINE__) -#ifdef HAVE_GETEUID +#if HAVE_GETEUID #define MY_UID() geteuid() #else #define MY_UID() getuid() #endif -#ifdef HAVE_GETEGID +#if HAVE_GETEGID #define MY_GID() getegid() #else #define MY_GID() getgid() @@ -768,12 +810,11 @@ 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); +#if !HAVE_INET_NTOP +const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif /* !HAVE_INET_NTOP */ -#ifndef HAVE_INET_PTON +#if !HAVE_INET_PTON int inet_pton(int af, const char *src, void *dst); #endif